Fixed conlitc
Fixed conlitc
Merge remote-tracking branch 'upstream/2.2/develop' into 2.2/develop
tests for the database authentication during the install process
travis and phpunit.xml changes
changing host
Merge branch 'feature/selenium' of github.com:pyrocms/pyrocms into feature/selenium
Breaking for travis.
Exclude 2.0 and 2.1 from Seleniums activities, and test with 5.4.
changing the file names of the tests and making changes to travis
removing a stupid sleep
adding the missing db field test
adding the missing db field test
fixing that assertion
fixing that assertion
trying a shared session
adding unwritable file structure test
moving back to teardown
it was working and now its not...
rewriting selenium tests with goutte