Marijn Jansen 96f421d088 Merge branch 'master' into 'marijn-postdelete' ...

# Conflicts:
#   website/public/js/masonry.js

2017-02-01 14:41:45 +01:00

.idea

Revert "Merge branch 'marijn-settings' into 'master'"

2017-01-26 12:16:28 +01:00

projectplan

Projectplan

2017-01-18 13:46:50 +01:00

website

Merge branch 'master' into 'marijn-postdelete'

2017-02-01 14:41:45 +01:00

.gitignore

Ignore .idea folder

2017-01-19 11:00:55 +01:00

Description

https://myhyvesbookplus.nl/

2.5 MiB

Languages

PHP 86.7%

JavaScript 6%

CSS 3.7%

TeX 2.9%

Hack 0.7%