Marijn index #52

Merged
11166932 merged 3 commits from marijn-index into master 2017-01-13 16:11:20 +01:00

3 Commits

Author SHA1 Message Date
Marijn Jansen
573bf60344 Merge branch 'master' into marijn-index 2017-01-13 16:10:33 +01:00
Marijn Jansen
10db23ffee Merge branch 'joey-testing' into 'master'
Added popup

See merge request !47
2017-01-13 16:06:09 +01:00
Joey Lai
2ad1b49cfd Added popup 2017-01-13 15:52:46 +01:00