comments #33

Merged
11035064 merged 5 commits from felix into master 2017-06-30 00:02:06 +02:00

5 Commits

Author SHA1 Message Date
Felix Atsma
d61b058d0e Merge remote-tracking branch 'origin/master' into felix 2017-06-30 00:01:22 +02:00
Niels Zwemmer
69bbfeaacd Merge branch 'niels-profile' into 'master'
Fixed sepia filter uploading black pictures.

See merge request !32
2017-06-29 16:22:15 +02:00
Niels Zwemmer
1f4fa4c768 Fixed sepia filter uploading black pictures. 2017-06-29 16:21:18 +02:00
Marijn Jansen
dc7690e183 Merge branch 'marijn-fixdingen' into 'master'
Fixed double things in timeline :)

See merge request !31
2017-06-29 16:02:00 +02:00
Marijn Jansen
a4108e9e19 Fixed double things in timeline :) 2017-06-29 16:01:04 +02:00