rebase modification

This commit is contained in:
Alexandre Cloutier 2014-09-30 17:21:05 -04:00 committed by Francis Lachapelle
parent 8ef222ab44
commit edbd661104
2 changed files with 3 additions and 4 deletions

View file

@ -237,7 +237,6 @@
{ {
response = [self responseWithStatus: 403 response = [self responseWithStatus: 403
andString: @"No such user."]; andString: @"No such user."];
return response;
} }
else else
{ {
@ -251,7 +250,7 @@
response = [self jsCloseWithRefreshMethod: nil]; response = [self jsCloseWithRefreshMethod: nil];
} }
}
return response; return response;
} }

View file

@ -6,9 +6,9 @@ WEBSERVER_RESOURCE_DIRS = css fonts img js
build-static-files: build-static-files:
@if [ -d bower_components ]; then \ @if [ -d bower_components ]; then \
bower update; \ bower update --allow-root; \
else \ else \
bower install; \ bower install --allow-root; \
fi fi
( cd bower_components/underscore/ && npm run-script build ) ( cd bower_components/underscore/ && npm run-script build )
grunt build grunt build