Merge remote-tracking branch 'upstream/master' into hardened-stdenv

2016-02-28 16:32:57 +00:00
parent 8615f026a4 a9d24cedeb
commit 3b4765c9e5
302 changed files with 13274 additions and 2727 deletions
@@ -20,7 +20,7 @@ in stdenv.mkDerivation rec {
  '';

  meta = with stdenv.lib; {
-    description = "A tool for easy screencapping and uploading to imgur.";
+    description = "A tool for easy screencapping and uploading to imgur";
    homepage = "https://https://github.com/jomo/imgur-screenshot/";
    platforms = platforms.linux;
    license = licenses.mit;