group-butler / GroupButler

64%

master: 22%

LAST BUILD ON BRANCH pg-users-and-fixed-translations

branch: pg-users-and-fixed-translations

CHANGE BRANCH

x

Reset

• pg-users-and-fixed-translations
• 361-translation-race-condition
• before-great-crowdin-sync
• before-pg-admins
• develop
• feature/admincachetopg
• feature/chatstopg
• feature/code-cleanup-and-tests
• feature/gitlab-ci
• feature/oop-translations
• feature/userstopg
• hotfix/361-translation-race-condition
• l10n_develop
• l10n_master
• master
• staging
• test

Build # 752

Build Type

push

travis-ci-com

Committed by yangm97

Commit Message

Merge branch 'develop'

Signed-off-by: Yan Minari <yangm97@gmail.com>

# Conflicts:
#	lua/groupbutler/languages.lua
#	lua/groupbutler/main.lua
#	lua/groupbutler/plugins/antispam.lua
#	lua/groupbutler/plugins/defaultpermissions.lua
#	lua/groupbutler/plugins/floodmanager.lua
#	lua/groupbutler/plugins/logchannel.lua
#	lua/groupbutler/plugins/mediasettings.lua
#	lua/groupbutler/plugins/menu.lua
#	lua/groupbutler/plugins/setlang.lua

Run Details

32 of 50 relevant lines covered (64.0%)

1.28 hits per line