LupusNobilis/sogo
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Revert "rebase modification"

Browse source 
This reverts commit 45c5bbd36a.
This commit is contained in:
Francis Lachapelle 2014-10-08 10:36:46 -04:00
parent e11eea7548
commit 63b20c4ba2
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
UI/Common/UIxUserRightsEditor.m
View file

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

4
UI/WebServerResources/GNUmakefile
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 --allow-root; \ bower update; \
else \ else \
bower install --allow-root; \ bower install; \
fi fi
( cd bower_components/underscore/ && npm run-script build ) ( cd bower_components/underscore/ && npm run-script build )
grunt build grunt build