Merge branch 'refs/heads/master' into develop

midwire · Aug 27, 2013 · 824146d · 824146d
2 parents bae8408 + c3b38e2
commit 824146d
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,10 @@
+*0.3.14* (August 27, 2013)
+
+* Added elocate plugin for braindead Solaris machines et. al.
+* Added Bash 'ask' function
+* Updated the pinkbox plugin - Only FLA devs care.
+* Moved some aliases around
+
 *0.3.13* (July 31, 2013)
 
 * Moved 2 more functions into global_functions.sh

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 # .env
 
-**Version: 0.3.13**
+**Version: 0.3.14**
 
 .env (Dot-Env) is a comprehensive, cascading Bash environment system.  It provides Bash shell-prompt themes, handy functions, aliases, and tools for the Bash power user.  Plugins have recently been introduced for extensibility.
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.3.13
+0.3.14