Nathan Guse d4ee7718b9 Merge remote-tracking branch 'remotes/Marc/ticket/11404' into develop ...

# By Marc Alexander
# Via Marc Alexander
* remotes/Marc/ticket/11404:
  [ticket/11404] Remove version ID from manager_test.php file header
  [ticket/11404] Add tests for phpbb_avatar_manager::clean_row()
  [ticket/11404] Convert manager_test to UNIX line endings
  [ticket/11404] Use a default data row if $row is empty in clean_row()
  [ticket/11404] Return empty array of avatar data if $row is empty

2013-03-12 14:48:07 -05:00

..

adm

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166

2013-03-06 07:35:47 +01:00

assets/javascript

Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11166

2013-03-06 07:35:47 +01:00

cache

…

config

[ticket/10202] Define phpbb_config_db_text as a service.

2013-03-05 22:59:57 +01:00

develop

[ticket/10202] Upgrade TEXT to the bigger MTEXT.

2013-03-05 22:59:57 +01:00

docs

Merge branch 'develop-olympus' into develop

2013-02-24 17:37:38 +01:00

download

Merge remote-tracking branch 'remotes/nickv/ticket/10714' into develop

2013-03-04 18:11:42 -06:00

files

…

images

…

includes

Merge remote-tracking branch 'remotes/Marc/ticket/11404' into develop

2013-03-12 14:48:07 -05:00

install

[ticket/10202] Upgrade TEXT to the bigger MTEXT.

2013-03-05 22:59:57 +01:00

language

Merge remote-tracking branch 'EXreaction/ticket/11394' into develop

2013-03-04 15:10:48 -05:00

store

…

styles

[ticket/11433] Rename CSS class "jalert" to "phpbb_alert"

2013-03-12 15:15:21 +01:00

.htaccess

…

app.php

…

common.php

Merge remote-tracking branch 'remotes/nickv/ticket/10714' into develop

2013-03-04 18:11:42 -06:00

composer.json

…

composer.lock

…

cron.php

…

faq.php

…

feed.php

…

index.php

…

mcp.php

…

memberlist.php

Merge remote-tracking branch 'remotes/marc/feature/avatars' into develop

2013-03-04 13:33:42 -06:00

posting.php

…

report.php

…

search.php

…

ucp.php

…

viewforum.php

…

viewonline.php

…

viewtopic.php

[ticket/11201] Revert WLM dropping because it is still used in China.

2013-02-04 01:31:43 +01:00

web.config

…