Marius Hein cb28f00c4d Merge branch 'master' into feature/custom-notification-command-8644		2015-03-12 16:45:57 +01:00
..
clicommands	Note that our license is GPL v2 or any later version in our license header instead of pointing to the license's URL	2015-02-04 10:52:27 +01:00
controllers	Merge branch 'master' into feature/custom-notification-command-8644	2015-03-12 16:45:57 +01:00
forms	Merge branch 'master' into feature/custom-notification-command-8644	2015-03-12 16:45:57 +01:00
locale	fixed transaltions	2015-02-12 11:26:35 +01:00
views	Merge branch 'master' into feature/custom-notification-command-8644	2015-03-12 16:45:57 +01:00