Merges

bus-stop · Sep 24, 2017 · e5252e1 · e5252e1
1 parent cf1493c
commit e5252e1
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 0 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -30,3 +30,9 @@ Pietro De Nicolao (https://github.com/pietrodn)
 
 Ivan Kravets (https://github.com/ivankravets)
  * Fix issue when running `electron` command
+
+ Miguel Palau (https://github.com/mike3run)
+ * Add gruvbox theme
+
+ Takumi Abe(https://github.com/takumiabe)
+  * Fix terminal corruption on fullscreen
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.6.1 (development)
+ * Merged gruvbox theme (from @mike3run)
+ * Fixed corruption when terminal is maximised (from @takumiabe)
+
 ## 0.6.0
  * Added note that theme change requires terminal restart.
  * Fix issue when running `electron` command (@ivankravets)

diff --git a/package.json b/package.json
@@ -65,7 +65,16 @@
     {
       "name": "Pietro De Nicolao",
       "url": "https://pietrodn.wordpress.org/"
+    },
+    {
+      "name": "Miguel Palau",
+      "url": "https://github.com/mike3run"
+    },
+    {
+      "name": "Takumi Abe",
+      "url": "https://github.com/takumiabe"
     }
+
   ],
   "homepage": "https://atom.io/packages/termination",
   "repository": "https://github.com/Fred-Barclay/Termination",