Marijn Jansen 08c3d73377 Merge branch 'master' into 'marijn-settings' ...

# Conflicts:
#   website/views/menu.php

2017-01-24 14:02:19 +01:00

..

public

Merge branch 'master' into 'marijn-settings'

2017-01-24 14:02:19 +01:00

queries

Merge branch 'master' into 'marijn-settings'

2017-01-24 14:02:19 +01:00

views

Merge branch 'master' into 'marijn-settings'

2017-01-24 14:02:19 +01:00

bronvermelding.txt

Datepicker added

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