]> git.jsancho.org Git - blog.git/commit
Merge branch 'master' into english
authorJavier Sancho <jsf@jsancho.org>
Thu, 2 Aug 2018 16:13:33 +0000 (18:13 +0200)
committerJavier Sancho <jsf@jsancho.org>
Thu, 2 Aug 2018 16:13:33 +0000 (18:13 +0200)
commit7a5e47eaed48100d3f065a8df9aad51d12bbaa61
tree9db3c4c99f5e94987a52c1127476808f6e5d81cb
parentc259035bbbbb2006bc88dadac264060ff35d7d46
parent9bd4f6a6caf4540daa9c0d377ba6e666d0d12198
Merge branch 'master' into english