Daniel Hensby f874e30ad3 Merge branch 2.1 ... Conflicts: .travis.yml		2015-11-03 21:47:49 +00:00
..
controller	Set current locale on POST requests (fixes #156)	2015-06-01 20:54:38 +12:00
forms	Update LanguageDropdownField.php	2013-07-12 16:59:19 +12:00
model	Merge branch 2.1	2015-11-03 21:47:49 +00:00
tasks	Coding conventions fixes (mostly line length)	2012-10-02 22:34:16 +02:00