mirror of
https://github.com/viq/NewsBlur.git
synced 2025-09-18 21:43:31 +00:00
Switching back to master after django 1.11 merge.
This commit is contained in:
parent
77465354a3
commit
5dfbeb41af
1 changed files with 4 additions and 1 deletions
5
fabfile.py
vendored
5
fabfile.py
vendored
|
@ -1651,9 +1651,12 @@ def setup_ec2():
|
|||
# ==========
|
||||
|
||||
@parallel
|
||||
def pull():
|
||||
def pull(master=False):
|
||||
with virtualenv():
|
||||
run('git pull')
|
||||
if master:
|
||||
run('git checkout master')
|
||||
run('git pull')
|
||||
|
||||
def pre_deploy():
|
||||
compress_assets(bundle=True)
|
||||
|
|
Loading…
Add table
Reference in a new issue