plegall 2e071ba4a1 merge --squash from translation up to f9fecd0be0 ...

git merge --squash is simpler for the first time, then we plan to do cherry-pick

2016-03-08 10:51:10 +01:00

..

help_add_photos.html

…

help_misc.html

merge --squash from translation up to f9fecd0be0

2016-03-08 10:51:10 +01:00

index.php

…