Maximilian Mader 06882254a0 Merge branch 'master' into attachments ...

Conflicts:
	template/javascriptInclude.tpl

2013-10-06 02:12:42 +02:00

..

message

Fix triple-typo ... this should fix the permissions

2013-09-06 16:16:55 +02:00

room

Respect LOG_IP_ADDRESS setting

2013-09-13 23:04:37 +02:00

suspension

Fix formatting of PHPDoc in SuspensionAction

2013-10-06 01:41:05 +02:00

CHATDatabaseObject.class.php

Added missing space

2013-01-27 18:14:27 +01:00