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

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

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

..

fonts

Added font awesome

2017-01-11 13:38:40 +01:00

img

New Logo

2017-01-11 10:56:03 +01:00

js

Added extra functions to the header.

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

php

Fixed username in connection

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

styles

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

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

views

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

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

chat.php

Merge branch 'master' into marijn-chat

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

index.php

Added footer include

2017-01-11 13:05:01 +01:00