Merge remote-tracking branch 'refs/remotes/origin/develop'

dgarijo · Mar 9, 2018 · b86deb9 · b86deb9
2 parents 56bad8b + a9930d9
commit b86deb9
Showing 1 changed file with 0 additions and 0 deletions.
diff --git a/...in/resources/widoco/fr.properties (to do) → src/main/resources/widoco/fr.properties b/...in/resources/widoco/fr.properties (to do) → src/main/resources/widoco/fr.properties