]> git.jsancho.org Git - blog.git/commitdiff
projects / blog.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6dc70c8 fe004bf)
Merge branch 'master' into spanish
authorJavier Sancho <jsf@jsancho.org>
Fri, 23 Feb 2018 09:39:37 +0000 (10:39 +0100)
committerJavier Sancho <jsf@jsancho.org>
Fri, 23 Feb 2018 09:39:37 +0000 (10:39 +0100)

Trivial merge
My blog