Merge branch 'v1.4' of https://gogs.librecmc.org/librecmc/librecmc into v1.4
authorRISCi_ATOM <bob@bobcall.me>
Tue, 4 Sep 2018 18:22:53 +0000 (14:22 -0400)
committerRISCi_ATOM <bob@bobcall.me>
Tue, 4 Sep 2018 18:22:53 +0000 (14:22 -0400)
commit09fad0b4391f83cdc04b26c3e24475551f38d435
treef34bbe359e74bcd072bc01d3d8c1e4d7284604f0
parentf7806b2e81b0439ddef09b272343da3f760ad9f5
parent94bc4f05605ac6d34551b3bd3f37ef1d4cb8404f
Merge branch 'v1.4' of https://gogs.librecmc.org/librecmc/librecmc into v1.4