Joseph Warner 3a6b3d7c2b [feature/oauth] Merge branch 'develop' of git://github.com/phpbb/phpbb3 into feature/oauth ... Conflicts: phpBB/composer.json phpBB/composer.lock phpBB/develop/create_schema_files.php phpBB/includes/ucp/ucp_register.php PHPBB3-11673		2013-09-06 20:35:54 -04:00
..
.htaccess	[feature/dic] Add trailing newline to htaccess	2012-07-26 15:58:26 +02:00
auth_providers.yml	[feature/oauth] Fix redirects	2013-08-24 21:34:37 -04:00
avatars.yml	[ticket/11335] (avatars) Make php_ext 'php' not '.php'	2013-04-24 17:45:46 -05:00
cron_tasks.yml	[ticket/11257] Do not require set_name() method to exist	2012-12-07 21:25:42 -06:00
feed.yml	[ticket/9657] Use the service instead of the static class	2013-07-11 14:24:07 +02:00
migrator.yml	[ticket/11386] Send list of migrations instead of using load_migrations	2013-03-03 19:54:22 -06:00
notifications.yml	[ticket/11413] Remove remaining irrelevant code to this PR	2013-05-03 08:50:27 -05:00
routing.yml	[feature/controller] Update routing documentation for using query string	2012-11-18 13:40:24 -05:00
services.yml	[ticket/11215] Make controller helper url() method use correct format	2013-09-02 10:54:55 -07:00
tables.yml	[feature/oauth] Fix more errors related to sql changes	2013-07-23 22:29:27 -04:00