3 commits

Auteur	SHA1	Message	Date
akuma06	798ec9a3a8	Merge remote-tracking branch 'refs/remotes/origin/dev' into notifications ... # Conflicts: # templates/_badgemenu.html	2017-05-21 01:21:56 +02:00
akuma06	5f60970eb9	Finished	2017-05-21 01:06:40 +02:00
akuma06	0390fc5215	Mostly done	2017-05-21 00:02:57 +02:00