diff options
author | Seb Bacon <seb.bacon@gmail.com> | 2012-06-20 10:46:57 +0100 |
---|---|---|
committer | Seb Bacon <seb.bacon@gmail.com> | 2012-06-20 10:46:57 +0100 |
commit | 6c4c822ef7a4491bf821326af779e5be9118c0a1 (patch) | |
tree | 39cf3564b1b2fb6be26499eda2a41be7ba59ad65 /vendor/gems/rspec-1.3.1/bin/spec | |
parent | ea977a0b9e86bc99a84de8577fa4ce1d304ac489 (diff) | |
parent | 08dac0261325cd757b7146f9626f3c7b48cc672c (diff) |
Merge branch 'release/0.6'0.6
Conflicts:
locale/bs/app.po
locale/ca/app.po
locale/cs/app.po
locale/cy/app.po
locale/de/app.po
locale/en_IE/app.po
locale/es/app.po
locale/eu/app.po
locale/fr/app.po
locale/ga_IE/app.po
locale/gl/app.po
locale/hu_HU/app.po
locale/id/app.po
locale/pt_BR/app.po
locale/sq/app.po
locale/sr@latin/app.po
spec/fixtures/locale/en/app.po
Diffstat (limited to 'vendor/gems/rspec-1.3.1/bin/spec')
-rwxr-xr-x | vendor/gems/rspec-1.3.1/bin/spec | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/vendor/gems/rspec-1.3.1/bin/spec b/vendor/gems/rspec-1.3.1/bin/spec deleted file mode 100755 index d3dd2430f..000000000 --- a/vendor/gems/rspec-1.3.1/bin/spec +++ /dev/null @@ -1,5 +0,0 @@ -#!/usr/bin/env ruby -rspec_dir = File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib')) -$LOAD_PATH.unshift(rspec_dir) unless $LOAD_PATH.include?(rspec_dir) -require 'spec/autorun' -exit ::Spec::Runner::CommandLine.run |