Merge branch 'jlxip/next' into next
authorDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Tue, 4 Apr 2017 18:26:54 +0000 (20:26 +0200)
committerDavid ‘Bombe’ Roden <bombe@freenetproject.org>
Tue, 4 Apr 2017 18:26:54 +0000 (20:26 +0200)
commitde44e6a11cae17c6b5715f24964d2e73b236f3a3
tree8dbebd66f903f15610802421d907651539d82a30
parentb4a7b488bcccd68045e5009aea177a5262535573
parentf090d9d58d18611d6b862e9fd49f3c882550f624
Merge branch 'jlxip/next' into next

This adds a Spanish translation to jSite