Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master'
Browse files Browse the repository at this point in the history
Conflicts:
	README.md
  • Loading branch information
samhatoum committed Dec 12, 2014
2 parents 61f0cef + d59de00 commit 4817a43
Showing 1 changed file with 2 additions and 5 deletions.
7 changes: 2 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ markdown powered blog on your site.
* Customizable styling with the ability to add your own classes to elements!
* Publish / Unpublish / Archive / Unarchive workflows

[Try the demo site](http://mdblog.meteor.com)
[Try the demo site](http://md-blog.meteor.com)

[See the demo site code](https://github.com/xolvio/md-blog)

Expand Down Expand Up @@ -155,7 +155,4 @@ Todo list:
* [ ] Date Picker
* [ ] Author Picker
* [ ] Pagination
* [ ] Admin page for backup / restore of data
* [ ] Admin page for user management
* [ ] Auto draft saving + history
* [ ] Tabbed view for: All / Published / Unpublished / Archived
* [ ] Auto draft saving + history

0 comments on commit 4817a43

Please sign in to comment.