Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' into texticle_console

Conflicts:
	CHANGELOG.rdoc
  • Loading branch information...
commit 3d371894249d328fbeb15b89158986fef0555647 2 parents 629a751 + 435dceb
Ben Hamill benhamill authored
Showing with 1 addition and 1 deletion.
  1. +1 −1  CHANGELOG.rdoc
2  CHANGELOG.rdoc
View
@@ -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
Please sign in to comment.
Something went wrong with that request. Please try again.