Marijn Jansen
|
423c2fd771
|
Revert "Merge branch 'marijn-settings' into 'master'"
This reverts merge request !128
|
2017-01-26 12:16:28 +01:00 |
|
Marijn Jansen
|
47eed5514a
|
Removed .idea folder
|
2017-01-26 12:14:07 +01:00 |
|
Marijn Jansen
|
176851b486
|
Added SQL Dialect
|
2017-01-17 16:48:57 +01:00 |
|
Marijn Jansen
|
1cffad77d6
|
rename html folder to public
|
2017-01-13 14:44:45 +01:00 |
|
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
|
cf240ca656
|
Almost a chatpage!
|
2017-01-10 17:08:40 +01:00 |
|
Marijn Jansen
|
5a3f4e4b09
|
.idea added
|
2017-01-10 14:18:17 +01:00 |
|