Merge remote-tracking branch 'upstream/master'

lolcommits · Dec 8, 2013 · 190ee53 · 190ee53
2 parents afa10ab + 9d62c26
commit 190ee53
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,6 +1,19 @@
 0.x.x (in development)
   * TODO: figure out problems with GUI clients
 
+0.5.2 (5 December 2013)
+  * Allow lolsrv plugin to sync/upload gifs (@matthutchinson #180)
+  * Plugins refactor, can now configure themselves (@matthutchinson #179)
+    - also closes issue #136 and issue #73
+  * Fix for Twitter gem dependency issue (@matthutchinson #178)
+  * Added coveralls support (@Aaron1011 #177)
+    - gitignore updated, coveralls badge added to README
+  * Refactor tranzlate plugin, lolspeak now in plugin (@matthutchinson #176)
+  * Fix for 'Cannot satisfy json dependancy' (@matthutchinson #175)
+  * Better post commit hook enabling/disabling (@matthutchinson #173)
+  * Improved --enable option, accepts passing arguments (@matthutchinson #154)
+    - README updated to explain enabling with options
+
 0.5.1 (13 November 2013)
   * Fix JSON gem issue #163 (@matthutchinson, #171)
   * Enable image capture under Cygwin (@cwc, #105)

diff --git a/lib/lolcommits/version.rb b/lib/lolcommits/version.rb
@@ -1,3 +1,3 @@
 module Lolcommits
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end