forked from extern/egroupware
pending changes
This commit is contained in:
parent
ed8fb28f8e
commit
c24ecef879
@ -7,7 +7,6 @@ BRANCH=$(echo $VERSION|sed 's/\.[0-9]\{8\}$//')
|
||||
[ $VERSION = $BRANCH ] && VERSION="$BRANCH.x-dev"
|
||||
|
||||
[ $VERSION = "$DEFAULT.x-dev" ] && {
|
||||
cd $(dirname $0)
|
||||
grep self.version composer.json | while read pack version; do composer update $(echo $pack|cut -d'"' -f2); done
|
||||
git status composer.lock|grep composer.lock && {
|
||||
git stash; git pull --rebase; git stash pop
|
||||
|
@ -80,6 +80,11 @@ server {
|
||||
proxy_pass http://push:9501;
|
||||
}
|
||||
|
||||
# SmallParT videos
|
||||
location /egroupware/smallpart/Resources/Videos {
|
||||
alias /var/lib/egroupware/default/files/smallpart;
|
||||
}
|
||||
|
||||
# PHP in docroot
|
||||
#location ~ \.php {
|
||||
# fastcgi_pass fpm;
|
||||
|
Loading…
Reference in New Issue
Block a user