phpbb/phpBB
Joas Schilling 5bf48bddf8 Merge branch 'ticket/13808' into ticket/13808-master
* ticket/13808:
  [ticket/13808] Fix version

Conflicts:
	phpBB/docs/events.md
2015-05-28 12:35:25 +02:00
..
adm Merge branch '3.1.x' 2015-03-15 16:59:58 +08:00
assets [ticket/13666] Remove data-clicked attribute from all of form's submit buttons 2015-03-05 22:26:13 +01:00
bin [ticket/13769] Move environment check lower in phpbbcli.php 2015-05-23 17:26:52 -04:00
cache [ticket/11700] Add back accidently deleted file in cache dir 2013-09-17 16:18:04 +02:00
config Merge pull request #3586 from s9e/ticket/13680 2015-05-20 00:38:49 +02:00
develop Merge branch '3.1.x' 2015-05-06 01:14:08 +02:00
docs Merge branch 'ticket/13808' into ticket/13808-master 2015-05-28 12:35:25 +02:00
download [ticket/13455] Update calls to request_var() 2015-02-03 20:50:40 +01: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-05-28 10:49:45 +02:00
install [ticket/13804] Make template's user dependency optional 2015-05-05 19:16:49 +02:00
language Merge branch '3.1.x' 2015-05-04 10:57:17 +02:00
phpbb Merge branch '3.1.x' 2015-05-22 11:51:25 +02:00
store
styles/prosilver Merge branch '3.1.x' 2015-05-28 11:09:24 +02:00
.htaccess Merge branch 'develop-olympus' into develop-ascraeus 2014-05-03 00:37:28 +02:00
app.php [ticket/13450] Type-hint return value of $phpbb_container->get() 2015-01-12 20:19:07 +01:00
common.php [ticket/13697] Moving filesystem related functions to filesystem service 2015-04-16 13:24:10 +02:00
composer.json [ticket/13762] Moving language related functionality into a separate class 2015-05-02 13:37:12 +02:00
composer.lock [ticket/11530] Updated s9e\TextFormatter 2015-05-18 06:49:53 +02:00
cron.php [ticket/13455] Update calls to request_var() 2015-02-03 20:50:40 +01:00
faq.php [ticket/13647] Use the Symfony way for redirecting 2015-02-27 22:58:51 +01: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 [ticket/11530] Remove extra quotes when depth limit is exceeded 2015-05-18 03:57:48 +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 Merge branch '3.1.x' 2015-05-08 11:16:45 +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