Merge branch '0.10-maintenance'

Conflicts:
	tox.ini
This commit is contained in:
Daniel Neuhäuser 2013-06-27 16:52:34 +02:00
commit c02c23ee30
6 changed files with 17 additions and 1 deletions

View file

@ -102,7 +102,7 @@ class SignalsTestCase(FlaskTestCase):
def record_push(sender, **kwargs):
recorded.append('push')
def record_pop(sender, **kwargs):
recorded.append('push')
recorded.append('pop')
@app.route('/')
def index():