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

..

connect.php

Added password change

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

friendship.php

Merge branch 'master' into 'kevin-prototype'

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

group_member.php

The menu now backend supported

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

group_page.php

add changing single group status

2017-01-18 15:57:39 +01:00

login.php

Added salting and no similar username

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

private_message.php

Fixed Chat!

2017-01-18 15:37:49 +01:00

register.php

Fixed login link

2017-01-18 15:53:10 +01:00

settings.php

Merge branch 'master' into 'marijn-settings'

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

user.php

Merge branch 'master' into 'kevin-prototype'

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