diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-07-09 17:00:50 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-07-09 17:00:50 +0200 |
| commit | b0d8f0edaca07bf0ed59fcbba999277bffc8c0d5 (patch) | |
| tree | 2354ecc24665e473e0011bc37dd3fec4ef074837 /phpBB/includes/mcp/mcp_main.php | |
| parent | 3bd5214b5d15bc3309c58b6d585c0041a7812f37 (diff) | |
| parent | d5fd1ecfc8c2898d57135cccb06b62e9c28f1ce2 (diff) | |
| download | forums-b0d8f0edaca07bf0ed59fcbba999277bffc8c0d5.tar forums-b0d8f0edaca07bf0ed59fcbba999277bffc8c0d5.tar.gz forums-b0d8f0edaca07bf0ed59fcbba999277bffc8c0d5.tar.bz2 forums-b0d8f0edaca07bf0ed59fcbba999277bffc8c0d5.tar.xz forums-b0d8f0edaca07bf0ed59fcbba999277bffc8c0d5.zip | |
Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
[ticket/12786] Correcting some tabs
[ticket/12786] Array_merge instead copy array parts
[ticket/12786] Some changes of the comments.
[ticket/12786] Dixing a typo
[ticket/12786] Some minor fixes of comments and function naming
[ticket/12786] Add clean_cpf_db_entries
[ticket/12786] White spaces found
[ticket/12786] Add create_language_entries
[ticket/12786] Add get_custom_field_id
[ticket/12786] Extend profilefield_base_migration.php class
Diffstat (limited to 'phpBB/includes/mcp/mcp_main.php')
0 files changed, 0 insertions, 0 deletions