Marijn Jansen 1f6b92ea7b Merge branch 'marijn-chat' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-chat

2017-01-11 15:32:22 +01:00

..

fonts

Added font awesome

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

img

Small changes to profile page, added friend request button

2017-01-11 14:00:10 +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' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-chat

2017-01-11 15:32:22 +01:00

views

Merge branch 'marijn-chat' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into marijn-chat

2017-01-11 15:32:22 +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

profile.php

Small changes to profile page, added friend request button

2017-01-11 14:00:10 +01:00