Merge branch 'stable' into develop

This commit is contained in:
Jonne Haß 2015-05-31 15:49:54 +02:00
commit b2faf20d18

View file

@ -858,4 +858,4 @@ DEPENDENCIES
will_paginate (= 3.0.7)
BUNDLED WITH
1.10.0
1.10.2