Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
Conflicts:
	version.yaml
  • Loading branch information
jeme committed Sep 27, 2014
2 parents daa9716 + 3942628 commit 9dd0407
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
dotJEM Angular Routing [![Build Status](https://travis-ci.org/dotJEM/angular-routing.png?branch=master)](https://travis-ci.org/dotJEM/angular-routing)
=========

#### Latest release v0.6.8:
- Source: [angular-routing.js](https://raw.github.com/dotJEM/angular-routing/v0.6.8/build/angular-routing.js)
- Minified: [angular-routing.min.js](https://raw.github.com/dotJEM/angular-routing/v0.6.8/build/angular-routing.min.js)
- Folder: [Build](https://github.com/dotJEM/angular-routing/tree/v0.6.8/build)
#### Latest release v0.6.10:
- Source: [angular-routing.js](https://raw.github.com/dotJEM/angular-routing/v0.6.10/build/angular-routing.js)
- Minified: [angular-routing.min.js](https://raw.github.com/dotJEM/angular-routing/v0.6.10/build/angular-routing.min.js)
- Folder: [Build](https://github.com/dotJEM/angular-routing/tree/v0.6.10/build)

#### Latest build (currently not automated, so not 100% the latest always):
- Source: [angular-routing.js](https://raw.github.com/dotJEM/angular-routing/master/build/angular-routing.js)
Expand All @@ -15,7 +15,7 @@ The samples and api reference are currently a work in progress:
- **Api Reference:** http://dotjem.github.io/angular-routing/#/docs/api/dotjem.routing
- **Samples:** http://dotjem.github.io/angular-routing/

# Version v0.6.8
# Version v0.6.10

Inspired by the UI-Router project by Angular-UI, this project came to life as I wanted
to provide what I believe is more "true states" where the transitions could be
Expand Down
2 changes: 1 addition & 1 deletion version.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
---
version: 0.6.10
codename: lisa
stable: 0.6.10
stable: 0.6.10

0 comments on commit 9dd0407

Please sign in to comment.