Oskar Hahn 34b6ca80f3 Merge branch 'stable/1.6.x' ... Conflicts: CHANGELOG openslides/users/signals.py		2015-01-06 13:04:07 +01:00
..
core	Merge branch 'stable/1.6.x'	2015-01-06 13:04:07 +01:00
base.html	Tags for motions, agenda items and assignments	2015-01-03 17:00:48 +01:00
form.html	Prepared for release.	2014-05-19 22:55:54 +02:00
formbuttons_save.html	Rename and clean up static direcories.	2014-01-14 23:27:12 +01:00
formbuttons_saveapply.html	Rename and clean up static direcories.	2014-01-14 23:27:12 +01:00