phpbb/phpBB/config
Joas Schilling d998efcf54 Merge branch 'develop-ascraeus' into develop
* develop-ascraeus:
  [ticket/12932] Remove set_datetime_class method from user class
  [ticket/12932] Fix tests and calls to create_datetime
  [ticket/12932] Add method for getting the datetime class and allow overriding

Conflicts:
	phpBB/config/services.yml
2014-08-10 15:24:43 +02:00
..
.htaccess [feature/dic] Add trailing newline to htaccess 2012-07-26 15:58:26 +02:00
auth_providers.yml [ticket/12352] Use custom provider collection for auth providers 2014-06-01 21:31:06 +02:00
avatars.yml [ticket/11148] Use mimetype guesser for uploaded avatars 2014-06-23 21:39:24 +02:00
console.yml [ticket/12656] Pass user object into all console commands. 2014-07-17 20:37:24 +02:00
cron_tasks.yml [ticket/12517] Correctly call $log->add in prune shadow topics 2014-05-11 10:31:28 +02:00
feed.yml Merge branch 'ticket/11271' into ticket/11271-develop 2013-12-27 03:43:22 +05:30
migrator.yml [ticket/12812] Add a migrator tool for config_text database changes 2014-07-05 00:57:34 -07:00
mimetype_guessers.yml [ticket/11912] Introduce guesser priority to mimetype guessers 2013-11-11 21:18:23 +01:00
notifications.yml Merge pull request #1812 from prototech/ticket/11746 2013-11-02 11:55:16 -07:00
parameters.yml [ticket/12932] Add method for getting the datetime class and allow overriding 2014-08-10 13:41:08 +02:00
passwords.yml [ticket/12352] Add driver for woltlab community framework 1 passwords 2014-06-01 21:31:05 +02:00
profilefields.yml [ticket/12730] Add Google+ profile field type 2014-06-21 03:29:31 +05:30
routing.yml [feature/controller] Update routing documentation for using query string 2012-11-18 13:40:24 -05:00
services.yml Merge branch 'develop-ascraeus' into develop 2014-08-10 15:24:43 +02:00
tables.yml [ticket/11201] Inject table names rather then using constants 2014-01-18 12:36:18 +01:00
twig.yml [ticket/11649] Expose Twig through the container 2014-08-09 16:13:22 +02:00