8 commits

Author	SHA1	Message	Date
Joas Schilling	56eae4660c	Merge branch 'develop-ascraeus' into develop	2015-01-10 12:30:06 +01:00
Joas Schilling	0fe30e8a96	Merge pull request #3170 from Nicofuma/ticket/13266-develop ... [ticket/13266-develop] Enable twig dump function	2014-12-27 13:31:16 +01:00
Joas Schilling	ec90f2b380	[ticket/13421] Move tools to subdirectory ... PHPBB3-13421	2014-12-06 17:10:07 +01:00
Joas Schilling	11c9d11482	Merge branch 'develop-ascraeus' into develop	2014-11-22 15:43:33 +01:00
Tristan Darricau	6850169095	[ticket/13266] Enable the debug extension in the development environment ... PHPBB3-13266	2014-11-22 12:33:45 +01:00
Tristan Darricau	677b5b2cd4	[ticket/12620] Fix rebase ... PHPBB3-12620	2014-11-20 23:15:49 +01:00
Tristan Darricau	c98efc53a8	[ticket/12620] Fix rebase (move config file to the right directory) ... PHPBB3-12620	2014-11-20 21:00:01 +01:00
Tristan Darricau	6cbb60d13f	[ticket/12620] Adds a yaml config file ... PHPBB3-12620	2014-11-20 20:59:48 +01:00