MyHyvesBookPlus/WebDB
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Joey testing #204

Merged
11057122 merged 2 commits from joey-testing into master 2017-02-03 10:54:48 +01:00
Conversation 2 Commits 2 Files Changed 1 -1

2 Commits

Author SHA1 Message Date
Joey Lai
8d70804155 Merge branch 'joey-testing' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into joey-testing 2017-02-03 10:52:35 +01:00
Lars van Hijfte
fe190975d5 Merge branch 'master' into 'joey-testing' 
# Conflicts:
#   website/views/homeLoginRegister.php
 2017-02-03 10:41:05 +01:00