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

# Conflicts:
#   website/queries/settings.php

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

..

connect.php

Added password change

2017-01-18 10:43:54 +01:00

friendship.php

The menu now backend supported

2017-01-17 14:16:17 +01:00

group_member.php

The menu now backend supported

2017-01-17 14:16:17 +01:00

group_page.php

Fixed things

2017-01-17 15:02:54 +01:00

login.php

Added salting and no similar username

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

register.php

Added salting and no similar username

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

settings.php

Merge branch 'master' into 'marijn-settings'

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