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

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

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

..

chat.css

Merge branch 'marijn-chat' into 'lars-chat'

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

font-awesome.css

Added a header

2017-01-10 16:43:16 +01:00

footer.css

Added a footer.

2017-01-11 13:07:52 +01:00

header.css

Added extra functions to the header.

2017-01-11 13:49:54 +01:00

main.css

Merge branch 'master' into marijn-chat

2017-01-11 14:04:53 +01:00

menu.css

Added groups to the menu.

2017-01-11 13:06:09 +01:00