phpbb/phpBB
Marc Alexander 77bc8ee68b Merge branch '3.1.x'
Conflicts:
	phpBB/includes/acp/acp_board.php
	phpBB/includes/acp/acp_jabber.php
2015-06-07 14:59:33 +02:00
..
adm Merge branch '3.1.x' 2015-06-06 11:44:05 +02:00
assets Merge remote-tracking branch 'callumacrae/ticket/13905' into 3.1.x 2015-05-31 16:56:44 +02:00
bin Merge pull request #3554 from Nicofuma/ticket/13770 2015-05-29 10:56:54 +02:00
cache
config [ticket/13777] Deduplicate migration service definitions 2015-05-31 13:22:45 +02:00
develop [ticket/13844] Fix language file so the tests pass 2015-05-16 23:13:50 +02:00
docs Merge branch '3.1.x' 2015-06-04 17:46:36 +02:00
download [ticket/13770] Wither interface for container_builder 2015-05-14 23:04:03 +02:00
ext
files
images
includes Merge branch '3.1.x' 2015-06-07 14:59:33 +02:00
install [ticket/13777] Reorder get_module_infos() method's arguments 2015-05-31 16:03:11 +02:00
language Merge pull request #3383 from nickvergessen/ticket/9109 2015-05-29 16:04:56 +02:00
phpbb Merge branch '3.1.x' 2015-06-07 14:59:33 +02:00
store
styles/prosilver Merge branch '3.1.x' 2015-06-06 11:44:05 +02:00
.htaccess
app.php [ticket/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +01:00
common.php [ticket/13770] Fix tests 2015-05-14 23:04:23 +02:00
composer.json Merge branch '3.1.x' 2015-05-30 10:58:40 +02:00
composer.lock Merge branch '3.1.x' 2015-05-30 10:58:40 +02:00
cron.php [ticket/13455] Update calls to request_var() 2015-02-03 20:50:40 +01:00
faq.php [ticket/13844] FAQ in new controller format 2015-05-16 22:09:05 +02:00
feed.php [ticket/13455] Update calls to request_var() 2015-02-03 20:50:40 +01:00
index.php [ticket/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +01:00
mcp.php [ticket/13455] Remove unnecessary calls to utf8_normalize_nfc() 2015-02-03 20:50:40 +01:00
memberlist.php [ticket/13455] Remove request_var() references from comments 2015-02-03 20:56:48 +01:00
posting.php Merge branch '3.1.x' 2015-06-04 17:51:09 +02:00
report.php [ticket/13654] Moving reporting into controller 2015-04-16 11:29:11 +02:00
search.php Merge branch '3.1.x' 2015-02-18 18:04:46 +01:00
ucp.php [ticket/13455] Update calls to request_var() 2015-02-03 20:50:40 +01:00
viewforum.php Merge branch '3.1.x' 2015-03-06 13:45:12 +01:00
viewonline.php [ticket/13844] FAQ in new controller format 2015-05-16 22:09:05 +02:00
viewtopic.php Merge branch '3.1.x' 2015-05-06 21:47:10 +02:00
web.config [ticket/13271] Fix URL Rewriting on IIS7 2015-03-23 18:23:12 +01:00