Kevin prototype #110

Merged
11319801 merged 3 commits from kevin-prototype into master 2017-01-24 15:11:33 +01:00

3 Commits

Author SHA1 Message Date
K. Nobel
887c773463 Merge branch 'master' into kevin-prototype 2017-01-24 15:03:24 +01:00
Marijn Jansen
6314494177 Merge branch 'marijn-settings' into 'master'
Max file size for gifs.

See merge request !105
2017-01-24 14:49:02 +01:00
Marijn Jansen
86b97cc186 Max file size for gifs. 2017-01-24 14:47:38 +01:00