Ignoring whole vendor directory...
Merge remote-tracking branch 'master/master' into feature/simpler-front-controller
Merge remote-tracking branch 'origin/JOINDIN-465' into feature/simpler-front-controller
Merge remote-tracking branch 'origin/JOINDIN-466' into feature/simpler-front-controller
JOINDIN-495 #close Simplified the front controller and introduced Routers
Merge branch 'master' of github.com:joindin/joindin-api into feature/simpler-front-controller
Reverted changes to .gitignore
Removed @author tag as per PR feedback
Merge branch 'master' of github.com:joindin/joindin-api into feature/simpler-front-controller
only a request to / is valid with no version, so this needs to fall through to the DefaultRouter rather than default to 2.1
Merge branch 'chrishoult-feature/simpler-front-controller'