5 Commits

Author	SHA1	Message	Date
Marijn Jansen	544db8b608	Merge branch 'marijn-chat' into 'lars-chat' ... # Conflicts: # website/views/chat-view.php	2017-01-11 15:31:49 +01:00
Lars van Hijfte	0f562bd39c	Fixed chat size. ... It is all fixed, litteraly.	2017-01-11 15:29:47 +01:00
Marijn Jansen	1e6e454de4	Small changes	2017-01-11 15:26:01 +01:00
Marijn Jansen	38079cbcaf	Added Friend list in chat.	2017-01-11 14:38:07 +01:00
Marijn Jansen	eecdcad538	"before merge"	2017-01-11 14:04:04 +01:00