Merge into master#2

Merged

pierredup merged 10 commits into

May 28, 2018

Commits on Oct 6, 2016

Merge branch 'master' into develop
danrot
committed

Commits on May 11, 2017

Merge branch 'master' into develop
danrot
committed

Commits on Jun 16, 2017

Merge branch 'master' of https://github.com/massiveart/MassiveSearchBundle into develop
wachterjohannes
committed

Commits on Oct 16, 2017

Merge branch 'master' of https://github.com/massiveart/MassiveSearchBundle into develop
wachterjohannes
committed
Added a section about paging the search results (#112)

adsc-cloudtec
authored and
wachterjohannes
committed

Commits on Apr 13, 2018

Fixed travis tests (#117)
wachterjohannes
authored

Commits on Apr 17, 2018

Updated Elastic Search dev-Dependency (#115)

pascalvb
authored and
wachterjohannes
committed

Commits on May 28, 2018