Merge branch 'v2'

This commit is contained in:
Alec Leamas 2010-10-23 07:27:34 +02:00
commit 05616b698f

View file

@ -226,6 +226,8 @@ set -x
echo "Creating bundle $bundle_name" echo "Creating bundle $bundle_name"
cd dist cd dist
rm -rf $bundle_name rm -rf $bundle_name
rm -rf diaspora
git clone --quiet $GIT_REPO
cd diaspora cd diaspora
if [ "$BUNDLE_FIX" = 'yes' ]; then if [ "$BUNDLE_FIX" = 'yes' ]; then
rm -f Gemfile.lock rm -f Gemfile.lock