Joey Lai 82fc1e5266 Merge branch 'master' into 'joey-testing' ...

# Conflicts:
#   website/views/login_head.php

2017-01-20 16:06:16 +01:00

..

public

Merge branch 'master' into 'joey-testing'

2017-01-20 16:06:16 +01:00

queries

fixed crosssitescripting on settings pagw

2017-01-20 15:41:13 +01:00

views

Merge branch 'master' into 'joey-testing'

2017-01-20 16:06:16 +01:00

bronvermelding.txt

Datepicker added

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