Merge branch 'dev' of github.com:GsDevKit/Grease into dev

dalehenrich · dalehenrich · commit 4b2c66a5035b · 2017-02-28T13:57:27.000-08:00
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,6 @@
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist
+*~
diff --git a/.travis.yml b/.travis.yml
@@ -15,3 +15,6 @@ smalltalk:
 cache:
   directories:
     - $SMALLTALK_CI_CACHE
+matrix:
+  allow_failures:
+    - smalltalk: Pharo-6.0
