Marijn Jansen ab8c12c9d8 Merge branch 'master' into 'marijn-settings' ...

# Conflicts:
#   website/queries/settings.php

2017-01-18 14:52:32 +01:00

..

public

Merge branch 'master' into 'marijn-settings'

2017-01-18 14:52:32 +01:00

queries

Merge branch 'master' into 'marijn-settings'

2017-01-18 14:52:32 +01:00

views

Merge branch 'master' into 'marijn-settings'

2017-01-18 14:52:32 +01:00

bronvermelding.txt

Datepicker added

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

mysql_config.xml

Begin with the connection between php and mysql.

2017-01-17 12:48:01 +01:00