Skip to content

Commit

Permalink
Merge branch 'release/0.1.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
sdispater committed Nov 28, 2015
2 parents 57f54a8 + 68e5e00 commit df2b572
Show file tree
Hide file tree
Showing 9 changed files with 258 additions and 99 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
### 0.1.1


(November 28th, 2015)

##### Fixes

Expand Down
4 changes: 1 addition & 3 deletions README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Flask-Orator
############

.. image:: https://travis-ci.org/sdispater/flask-orator.png
:alt: Orator Build status
:alt: Flask Orator Build status
:target: https://travis-ci.org/sdispater/flask-orator

Flask-Orator adds `Orator ORM <https://github.com/sdispater/orator>`_ support to Flask applications.
Expand All @@ -11,7 +11,5 @@ Flask-Orator adds `Orator ORM <https://github.com/sdispater/orator>`_ support to
Resources
=========

You can install Orator in 2 different ways:

* `Documentation <http://flask-orator.readthedocs.org>`_
* `Issue Tracker <https://github.com/sdispater/flask-orator/issues>`_
Loading

0 comments on commit df2b572

Please sign in to comment.