diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-13 20:43:31 -0600 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-12-13 20:46:25 -0600 |
| commit | 2469225a721cfa49528a00dd8cae075de726277f (patch) | |
| tree | beeb297044b5fccaa3f701e64e0f9ec731ae95f2 /phpBB/includes/diff/engine.php | |
| parent | a50907250e487675baf9ac77be564b6ccb72b056 (diff) | |
| parent | f4df152b4b88d2c7e2866cc829059781d2aea437 (diff) | |
| download | forums-2469225a721cfa49528a00dd8cae075de726277f.tar forums-2469225a721cfa49528a00dd8cae075de726277f.tar.gz forums-2469225a721cfa49528a00dd8cae075de726277f.tar.bz2 forums-2469225a721cfa49528a00dd8cae075de726277f.tar.xz forums-2469225a721cfa49528a00dd8cae075de726277f.zip | |
Merge branch 'develop-olympus' of github.com:phpbb/phpbb3 into ticket/8610
# By Oleg Pudeyev (29) and others
# Via Andreas Fischer (3) and others
* 'develop-olympus' of github.com:phpbb/phpbb3: (36 commits)
[ticket/11262] Add .lock in cache directory to .gitignore
[ticket/11265] Add assertions for board installation success.
[ticket/11162] Reformat.
[ticket/10491] Make recreate_database static.
[ticket/11162] Rename tricky updates to database helper.
[ticket/10491] Install board once per test run.
[ticket/10972] Drop user deletion.
[ticket/10972] Tweak user addition.
[ticket/10972] Add destroy method to mock cache.
[ticket/10972] Add mock null cache.
[ticket/10972] Backport get_db from develop.
[ticket/10972] Added explicit checks for creating duplicate users.
[ticket/10972] Moved tests into appropriate places and added comments
[ticket/10972] Added methods for creating and deleting basic users
[ticket/11162] Use empty($queries).
[ticket/11162] Review comments fixed.
[ticket/11162] Reformat.
[ticket/11162] Newlines to LF.
[ticket/11162] Use correct functions.
[ticket/11162] Account for notify_status.
...
Conflicts:
phpBB/includes/mcp/mcp_topic.php
Diffstat (limited to 'phpBB/includes/diff/engine.php')
0 files changed, 0 insertions, 0 deletions