Commit Graph

5 Commits (605f22789743808c1f152ad9f844a61d2de3113b)

Author SHA1 Message Date
Moe d6f83fff27 Merge branch 'master' into 'dev'
# Conflicts:
#   languages/fr.json

(and this is why we never do Merge Requests directly to the master branch.)
2019-03-06 16:50:46 +00:00
hartigoon1 8811c0bd8b Update fr.json 2019-01-31 02:23:21 +00:00
hartigoon1 f7c33190ae Update fr.json 2019-01-26 14:47:09 +00:00
Stephen Wood 9acb0ed751 Add support for Raspberry Pi encoding/decoding. 2018-08-15 15:16:15 -07:00
Moe c940294f00 Shinobi Pro Lands on Gitlab 2018-06-09 16:34:06 -07:00