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

Commit

Permalink
Merge branch 'master' of github.com:mwaylabs/The-M-Project
Browse files Browse the repository at this point in the history
  • Loading branch information
hano committed Jan 15, 2014
2 parents 5d1a18a + bc9f8f5 commit 029f10d
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,10 @@ The Addressbook is the sample app for [Bikini](#bikini). [Open the app](http://w
## Roadmap

### Absinthe release
- The-M-Project v.2.0 beta 1 (We are here)
- The-M-Project v.2.0 beta 1
- All the fancy stuff we mentioned above

- The-M-Project v.2.0 beta 2
- The-M-Project v.2.0 beta 2 (We are here)
- MenuView
- SideMenu
- MenuLayout
Expand Down
4 changes: 3 additions & 1 deletion bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,14 @@
"sample",
"server",
"utils",
"tasks",
"doc-template",
"Gruntfile.js",
"*.sh",
"*.md",
"*.json",
"*.txt"
"*.txt",
"*.bat"
],
"dependencies": {
"backbone": "~1.1.0",
Expand Down

0 comments on commit 029f10d

Please sign in to comment.