Kevin Nobel 99bffc6f47 Merge branch 'master' into 'kevin-prototype' ...

# Conflicts:
#   website/queries/friendship.php
#   website/queries/user.php

2017-01-18 16:22:29 +01:00

..

public

Merge branch 'master' into 'kevin-prototype'

2017-01-18 16:22:29 +01:00

queries

Merge branch 'master' into 'kevin-prototype'

2017-01-18 16:22:29 +01:00

views

Merge branch 'master' into 'kevin-prototype'

2017-01-18 16:22:29 +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