rabuzarus 649578ae33 Merge develop-new into event-attendance-new ... Conflicts: include/conversation.php		2015-10-11 19:39:55 +02:00
..
BaseObject.php	…
Conversation.php	first work for consensus	2015-09-30 14:34:10 +02:00
Item.php	Merge develop-new into event-attendance-new	2015-10-11 19:39:55 +02:00
TemplateEngine.php	…