Lars algemeen #102

Merged
11291680 merged 9 commits from lars-algemeen into master 2017-01-23 16:27:49 +01:00

9 Commits

Author SHA1 Message Date
Lars van Hijfte
8c4c4a59fd Merge branch 'master' into lars-algemeen 2017-01-23 16:25:18 +01:00
Marijn Jansen
80f7c24641 Merge branch 'marijn-settings' into 'master'
Profile picrure old deletion (:

See merge request !97
2017-01-23 16:24:28 +01:00
Marijn Jansen
f82dd73b7d Profile picrure old deletion (: 2017-01-23 16:23:47 +01:00
Marijn Jansen
449b500636 Merge branch 'joey-testing' into 'master'
Fixed css and confirmation for logged in already

See merge request !96
2017-01-23 13:26:10 +01:00
Marijn Jansen
af11297fad Merge branch 'marijn-button' into 'master'
Marijn button

See merge request !95
2017-01-23 13:25:07 +01:00
Marijn Jansen
46b47d5f8d Merge branch 'master' into marijn-button 2017-01-23 13:24:35 +01:00
Joey Lai
21ff896d65 Fixed css and confirmation for logged in already 2017-01-23 13:24:13 +01:00
Marijn Jansen
86b7e17137 new button! 2017-01-23 13:24:12 +01:00
Lars van Hijfte
76eb2dee7c Merge branch 'lars-algemeen' into 'master'
Lars algemeen

See merge request !94
2017-01-23 13:17:57 +01:00