merge from master

This commit is contained in:
Simon Cruanes 2014-05-23 00:44:40 +02:00
commit 453a818ace

View file

@ -73,7 +73,7 @@ push-stable: all
git checkout stable
git merge master -m 'merge from master'
oasis setup
git commit -a 'oasis files'
git commit -a -m 'oasis files'
git push origin
git checkout master