Permalink
Browse files

Merge branch '1.x'

* 1.x:
  (maint) Add Travis CI support to active branches

Conflicts:
	.gitignore
  • Loading branch information...
2 parents 7ae18a8 + 96f9d4e commit 14c2684ceb1458daf44adda9a6e2794df7119a5a @jeffmccune jeffmccune committed Jan 6, 2013
Showing with 2 additions and 1 deletion.
  1. +1 −1 .gitignore
  2. +1 −0 Rakefile
View
@@ -1,6 +1,6 @@
pkg
test.rb
ext/packaging
-Gemfile.lock
.bundle/
vendor/
+Gemfile.lock
View
@@ -44,6 +44,7 @@ if defined?(RSpec::Core::RakeTask)
RSpec::Core::RakeTask.new(:spec) do |t|
t.pattern = 'spec/**/*_spec.rb'
end
+ task :test => :spec
end
task :test => :spec

0 comments on commit 14c2684

Please sign in to comment.