Emanuel Schütze b11463fc60 Merge pull request #2690 from CatoTH/bugfix-incorrectly-merging-words ... Bugfix for merging change recommendations		2016-11-28 21:28:38 +01:00
..
js/motions	Merge pull request #2690 from CatoTH/bugfix-incorrectly-merging-words	2016-11-28 21:28:38 +01:00
templates	A proposition so mitigate #2615	2016-11-26 12:34:26 +01:00