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 /script/load-sample-data | |
| 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 'script/load-sample-data')
| -rwxr-xr-x | script/load-sample-data | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/script/load-sample-data b/script/load-sample-data index e5f1be4cd..86e1af128 100755 --- a/script/load-sample-data +++ b/script/load-sample-data @@ -6,7 +6,7 @@ LOC=`dirname "$0"` -rake --silent spec:db:fixtures:load +bundle exec rake --silent spec:db:fixtures:load "$LOC/runner" /dev/stdin <<END env = ENV["RAILS_ENV"] |