Merge branch 'master' into pr

This commit is contained in:
Alexey Zabelin 2018-04-29 18:58:53 -04:00 committed by GitHub
commit 225f810cdd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -3304,6 +3304,9 @@ packages:
"Rick Owens <rick@owensmurray.com> @owensmurray":
- om-elm
"ALeX Kazik <alex@kazik.de> @alexkazik":
- qnap-decrypt
# If you stop maintaining a package you can move it here.
# It will then be disabled if it starts causing problems.
# See https://github.com/fpco/stackage/issues/1056