Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Zizzamia/ng-tasty
Browse files Browse the repository at this point in the history
  • Loading branch information
Leonardo Zizzamia committed May 8, 2015
2 parents e67b308 + 4d28828 commit b872519
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"angular-route": "^1.3.0",
"angular-mocks": "^1.3.0",
"bootstrap": "3.2.0",
"ng-tasty": "~0.5.3"
"ng-tasty": "~0.5.4"
},
"license": "MIT",
"ignore": [
Expand Down
4 changes: 2 additions & 2 deletions website/template/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
<ul class="nav navbar-nav">
<!-- Home -->
<li>
<a href="/" class="logo">
<a href="<%= base %>" class="logo">
<h1><i class="fa fa-heart"></i> ngTasty</h1>
</a>
</li>
Expand Down Expand Up @@ -170,7 +170,7 @@ <h1><i class="fa fa-heart"></i> ngTasty</h1>
<script src="<%= base %>/bower_components/angular/angular.js"></script>
<script src="<%= base %>/bower_components/angular-route/angular-route.js"></script>
<script src="<%= base %>/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js"></script>
<script src="<%= ngTasty %>"></script>
<script src="<%= ngTasty %>?2"></script>
<script src="<%= base %>/static/js/app.js"></script>
<script src="<%= base %>/static/js/pages/app.js"></script>
<script src="<%= base %>/static/js/pages/api.js"></script>
Expand Down

0 comments on commit b872519

Please sign in to comment.