Joas Schilling a3883a6f23 Merge branch '3.1.x' ... Conflicts: build/build.xml phpBB/includes/constants.php phpBB/install/schemas/schema_data.sql phpBB/styles/prosilver/style.cfg phpBB/styles/subsilver2/style.cfg		2015-06-11 21:00:04 +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	Merge branch '3.1.x'	2015-06-09 15:24:08 +02:00
docs	Merge branch '3.1.x'	2015-06-11 21:00:04 +02:00
download	[ticket/13770] Wither interface for container_builder	2015-05-14 23:04:03 +02:00
ext	[ticket/11163] Add ext/index.htm	2014-05-15 14:11:11 +02:00
files
images
includes	Merge branch '3.1.x'	2015-06-11 21:00:04 +02:00
install	Merge branch '3.1.x'	2015-06-11 21:00:04 +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-11 21:00:04 +02:00
store
styles/prosilver	[prep-release-3.1.5] Update version to 3.1.5-RC1	2015-06-09 20:30:40 +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-08 17:59:49 +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-06-09 15:24:08 +02: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 'ticket/13930' into ticket/13930-master	2015-06-08 15:39:47 +02:00
web.config	[ticket/13271] Fix URL Rewriting on IIS7	2015-03-23 18:23:12 +01:00