Tim Düsterhus 81bdbccbe2 Merge branch 'master' into commands ...

Conflicts:
	file/lib/form/ChatForm.class.php
	template/chatMessage.tpl

2012-03-04 19:57:23 +01:00

..

acp

Take care of the DISPLAY_CLOCK setting

2012-03-04 15:42:57 +01:00

icon

Blue icon in navigation

2012-02-06 17:56:46 +01:00

js

Adding error handling when messages couldn't be loaded

2012-03-03 22:55:24 +01:00

lib

Merge branch 'master' into commands

2012-03-04 19:57:23 +01:00

style

Add missing js und wcf- Prefix

2012-02-12 12:32:21 +01:00