Jeremy Benoist 64a8781e45

Merge remote-tracking branch 'origin/master' into 2.2

2016-10-24 12:03:17 +02:00

..

AnnotationBundle

Add test on /api/annotations

2016-10-22 12:09:20 +02:00

ApiBundle

Merge pull request #2372 from pmartin/api-get-entry-as-epub

2016-10-12 14:06:33 +02:00

CoreBundle

Merge remote-tracking branch 'origin/master' into 2.2

2016-10-24 12:03:17 +02:00

ImportBundle

Fix test

2016-10-20 23:03:37 +02:00

UserBundle

Fixed two-factor checkbox display in user admin panel

2016-10-07 14:56:26 +02:00