Michael Vogel 4e3d0018c6 Merge remote-tracking branch 'upstream/master' ...

Conflicts:
	boot.php
	include/items.php
	update.php

2013-01-20 14:07:57 +01:00

..

BaseObject.php

Rendering is now done by Item objects

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

Conversation.php

Tabs trouble? What happened? I sure aven't changed anything to my editor...

2012-09-10 10:36:30 +02:00

Item.php

Merge remote-tracking branch 'upstream/master'

2013-01-20 14:07:57 +01:00