Merge branch 'v1.4' of https://gogs.librecmc.org/librecmc/librecmc into v1.4
authorRISCi_ATOM <bob@bobcall.me>
Thu, 18 Oct 2018 01:19:04 +0000 (21:19 -0400)
committerRISCi_ATOM <bob@bobcall.me>
Thu, 18 Oct 2018 01:19:04 +0000 (21:19 -0400)
commit5e305552baa8e4b026fff5e390493dee755d6454
tree1ba0683766f8785d256f7d4a7bd0773f661aa768
parentf817611c905bd1ee24deb27be81cf6ccb5e0ab1e
parent311bcad2c8da18f810b11e9665e6999f415df3d7
Merge branch 'v1.4' of https://gogs.librecmc.org/librecmc/librecmc into v1.4