Skip to content

Commit

Permalink
Merge branch 'badges' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
digi604 committed Nov 22, 2013
2 parents e2f671d + bb01f84 commit c1a4e63
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ Features
* Undo/Redo
* Use the content blocks (placeholders) in your own apps (models)
* Use the content blocks (stacks) anywhere in your templates
* Edit the content in the frontend directly on your pages
* Edit content directly in the frontend on your pages
* Hierarchical content plugins (columns, style changes etc)
* Navigation rendering and extending from your apps
* SEO friendly urls
Expand Down

0 comments on commit c1a4e63

Please sign in to comment.