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

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

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

.idea

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

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

projectplan

Small changes

2017-01-11 15:26:01 +01:00

website

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

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

.gitignore

added atom ftpconfig

2017-01-10 16:50:20 +01:00

Description

https://myhyvesbookplus.nl/

2.5 MiB

Languages

PHP 86.7%

JavaScript 6%

CSS 3.7%

TeX 2.9%

Hack 0.7%