Skip to content
This repository has been archived by the owner on Jan 21, 2020. It is now read-only.

Commit

Permalink
Merge branch 'hotfix/118'
Browse files Browse the repository at this point in the history 
Fixes #118
  • Loading branch information
@weierophinney
weierophinney committed Mar 6, 2014
2 parents 28ad167 + dd9ceb4 commit 3b6120b
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion asset/dist/zf-apigility-admin/html/api/rpc-services/settings-edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ <h4 class="panel-title">Content Negotiation</h4>
<collapse-body class="list-group">
<div class="form-group list-group-item">
<label class="control-label">Content Negotiation Selector</label>
<select class="form-control input-xlarge" ng-model="restService.selector" ng-options="v as v for (k,v) in selectors"></select>
<select class="form-control input-xlarge" ng-model="rpcService.selector" ng-options="v as v for (k,v) in selectors"></select>
</div>

<div class="form-group list-group-item">
Expand Down
2 changes: 1 addition & 1 deletion asset/src/zf-apigility-admin/html/api/rpc-services/settings-edit.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ <h4 class="panel-title">Content Negotiation</h4>
<collapse-body class="list-group">
<div class="form-group list-group-item">
<label class="control-label">Content Negotiation Selector</label>
<select class="form-control input-xlarge" ng-model="restService.selector" ng-options="v as v for (k,v) in selectors"></select>
<select class="form-control input-xlarge" ng-model="rpcService.selector" ng-options="v as v for (k,v) in selectors"></select>
</div>

<div class="form-group list-group-item">
Expand Down

0 comments on commit 3b6120b

Please # to comment.