85pando 791d13c87b Merge remote-tracking branch 'refs/remotes/upstream/master' ... Conflicts: app/Locale/de_DE/translations.php		2016-02-05 10:28:40 +01:00
..
translations.php	Merge remote-tracking branch 'refs/remotes/upstream/master'	2016-02-05 10:28:40 +01:00