Tim Düsterhus 94a48df147 Merge branch 'master' into commands ...

Conflicts:
	file/lib/data/chat/message/ChatMessage.class.php

2012-01-22 14:10:10 +01:00

..

chat.tpl

Send Desktop Notifications

2012-01-21 18:43:58 +01:00

chatCopyright.tpl

Added copyright ID and linked my GitHub profile ^^

2012-01-18 21:42:24 +01:00

chatJavascriptInclude.tpl

Code format and removing unneeded templatelistener

2012-01-21 17:45:53 +01:00

chatMessage.tpl

Adding separator

2011-12-27 14:21:06 +01:00

chatNavigationInclude.tpl

Changed log icon.

2011-12-15 22:22:27 +01:00