Hendrik testing #36

Merged
11342374 merged 8 commits from hendrik-testing into master 2017-01-13 10:53:31 +01:00

8 Commits

Author SHA1 Message Date
Hendrik
acb19c2354 Merge branch 'master' into hendrik-testing 2017-01-13 10:50:54 +01:00
Marijn Jansen
313b6462e2 Merge branch 'kevin-prototype' into 'master'
Kevin prototype

See merge request !31
2017-01-13 10:47:47 +01:00
K. Nobel
a0e2c60ddb Merge branch 'master' into kevin-prototype 2017-01-13 10:42:39 +01:00
K. Nobel
02149565ce Fixed post width for Chrome 2017-01-13 10:39:37 +01:00
Marijn Jansen
3c039d71cc Merge branch 'joey-testing' into 'master'
Joey testing

See merge request !29
2017-01-13 10:39:18 +01:00
Marijn Jansen
f8c690615c Merge branch 'hendrik-testing' into 'master'
Hendrik testing

See merge request !30
2017-01-13 10:38:54 +01:00
Joey Lai
042ec212b2 Merge branch 'joey-testing' of ssh://gitlab-fnwi.uva.nl:1337/11166932/WebDB into joey-testing 2017-01-13 10:14:07 +01:00
Joey Lai
36192c6bf4 fixed spelling and grammar 2017-01-12 14:44:59 +01:00