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

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

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

..

public

Merge branch 'master' into 'marijn-postdelete'

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

queries

Merge branch 'master' into 'marijn-postdelete'

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

views

Merge branch 'master' into 'marijn-postdelete'

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

bronvermelding.txt

Datepicker added

2017-01-12 13:03:46 +01:00