aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-06-10 17:05:05 +0200
committerMario Vavti <mario@mariovavti.com>2018-06-10 17:05:05 +0200
commit1b9a350469a51789d6ed1ceaaaf4a0d1c3406872 (patch)
treee4182c7a72fd081cede140217b0f238df5528371 /doc
parentd0f7b1d9b79a5a96314d5c6caa011f7050cec2f9 (diff)
parent46cc64f2d8a503c21c8eda6d4b0b17427d29d6cd (diff)
downloadvolse-hubzilla-1b9a350469a51789d6ed1ceaaaf4a0d1c3406872.tar.gz
volse-hubzilla-1b9a350469a51789d6ed1ceaaaf4a0d1c3406872.tar.bz2
volse-hubzilla-1b9a350469a51789d6ed1ceaaaf4a0d1c3406872.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'doc')
l---------doc/es2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/es b/doc/es
index c8ba7666b..a170c77bc 120000
--- a/doc/es
+++ b/doc/es
@@ -1 +1 @@
-es-es \ No newline at end of file
+doc/es-es \ No newline at end of file