Skip to content
Browse files

Merge branch 'master' into texticle_console

Conflicts:
	CHANGELOG.rdoc
  • Loading branch information...
2 parents 629a751 + 435dceb commit 3d371894249d328fbeb15b89158986fef0555647 @benhamill benhamill committed
Showing with 1 addition and 1 deletion.
  1. +1 −1 CHANGELOG.rdoc
View
2 CHANGELOG.rdoc
@@ -15,7 +15,7 @@
* 2 dev improvements
- * Test databse configuration not automatically generated from a rake task and ignored by git.
+ * Test database configuration not automatically generated from a rake task and ignored by git.
* New interactive developer console (powered by pry).
== 2.0.3

0 comments on commit 3d37189

Please sign in to comment.
Something went wrong with that request. Please try again.