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

# Conflicts:
#   website/queries/settings.php

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

..

adminpanel.css

rename html folder to public

2017-01-13 14:44:45 +01:00

chat.css

rename html folder to public

2017-01-13 14:44:45 +01:00

font-awesome.css

rename html folder to public

2017-01-13 14:44:45 +01:00

footer.css

rename html folder to public

2017-01-13 14:44:45 +01:00

header.css

rename html folder to public

2017-01-13 14:44:45 +01:00

index.css

Almost finished login/register page

2017-01-18 12:35:41 +01:00

main.css

rename html folder to public

2017-01-13 14:44:45 +01:00

menu.css

Fixed bugs

2017-01-13 15:47:59 +01:00

profile.css

Added masonry grid to profile and group pages.

2017-01-17 12:25:09 +01:00

search.css

rename html folder to public

2017-01-13 14:44:45 +01:00

settings.css

settings succes mesages

2017-01-18 14:51:03 +01:00