Merge changes from upstream

unfoldingWord / dcs

Door43 Content Service

https://git.door43.org

MIT License

0 stars 6 forks source link

Merge changes from upstream #261

Closed ethantkoenig closed 6 years ago

ethantkoenig commented 6 years ago

Includes up to the 1.4.0 release (https://github.com/go-gitea/gitea/commit/b62ce2e24655e2d9316770d4eb342b823111fe0e)

coveralls commented 6 years ago

Coverage increased (+1.4%) to 40.718% when pulling ae0eb5a5eeb1aeaa054edaefab5de9eff1f9a063 on ethantkoenig:ufw/merge_upstream into e250cc039ca4ca6e089f690f7cb83eeec7b1fc96 on unfoldingWord-dev:develop.

ethantkoenig commented 6 years ago

Some flaky unit tests are failing; I plan to fix the tests soon, but will merge this PR now for the sake of moving the release along.