Marijn Jansen 544db8b608 Merge branch 'marijn-chat' into 'lars-chat' ...

# Conflicts:
#   website/views/chat-view.php

2017-01-11 15:31:49 +01:00

..

inspectionProfiles

Small changes

2017-01-11 15:26:01 +01:00

modules.xml

.idea added

2017-01-10 14:18:17 +01:00

php.xml

Almost a chatpage!

2017-01-10 17:08:40 +01:00

vcs.xml

.idea added

2017-01-10 14:18:17 +01:00

WebDB.iml

Fixed chat size.

2017-01-11 15:29:47 +01:00