Michael Vogel 93143702ed Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	boot.php
	database.sql
	library/fancybox/jquery.fancybox-1.3.4.css
	mod/search.php
	update.php

2013-02-17 12:35:40 +01:00

..

BaseObject.php

Rendering is now done by Item objects

2012-08-10 19:57:39 +02:00

Conversation.php

Bugfixing after adding timestamps

2013-01-27 13:57:44 +01:00

Item.php

Merge remote-tracking branch 'upstream/master'

2013-02-17 12:35:40 +01:00