diff options
author | Robin Houston <robin.houston@gmail.com> | 2011-10-11 22:03:48 +0100 |
---|---|---|
committer | Robin Houston <robin.houston@gmail.com> | 2011-10-11 22:03:48 +0100 |
commit | bd7b9f23a976a14255b37e824e2ca95046a374c3 (patch) | |
tree | 07bbe799a4853f8167a2abfd3bef5dcda704ee21 | |
parent | cc1916fa18a445e9b4635fb1f715f6865ce1071a (diff) | |
parent | 7fc6b70ecfedbf80ad9ddeb7e1b650058c9c365d (diff) |
Merge commit '7fc6b70' into develop
-rw-r--r-- | Rakefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -5,7 +5,7 @@ require(File.join(File.dirname(__FILE__), 'config', 'boot')) require 'rake' require 'rake/testtask' -require 'rake/rdoctask' +require 'rdoc/task' require 'tasks/rails' |