Merge branch 'master' into fa-dev which includes the Persian translation
authorTomas Stary <T.Stary@exeter.ac.uk>
Sun, 2 Oct 2016 09:19:58 +0000 (10:19 +0100)
committerTomas Stary <T.Stary@exeter.ac.uk>
Sun, 2 Oct 2016 09:19:58 +0000 (10:19 +0100)
commit67f3559973636afe3098a5d86976b2b470df1b44
treebb4de335bbab1b4351a00550358e7a0b3103926f
parentbbada2e932211385ec9702cb3cfa04d0de131d92
parentfd1bf134460484435c23d9ae52dfa5f2c5de9051
Merge branch 'master' into fa-dev which includes the Persian translation