Merge branch 'stable' into develop

This commit is contained in:
Jonne Haß 2015-06-16 22:37:40 +02:00
commit bf69cb6d19

View file

@ -875,4 +875,4 @@ DEPENDENCIES
will_paginate (= 3.0.7)
BUNDLED WITH
1.10.3
1.10.4