Fixed redirect to profile page after going back 1 page #92

Merged

11057122 merged 2 commits from joey-testing into master

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

Author	SHA1	Message	Date
Joey Lai	95aaba7e7e	Merge branch 'joey-testing' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into joey-testing	2017-01-20 16:25:38 +01:00
Joey Lai	82fc1e5266	Merge branch 'master' into 'joey-testing' # Conflicts: # website/views/login_head.php	2017-01-20 16:06:16 +01:00