Commit graph

9 commits

Author SHA1 Message Date
Kasey 5663429280 applying PR #3456 changes to develop branch (#3472)
* updating with changes made to master

apply PR # 3456 to develop as well

* updating develop with changes made to master

apply PR # 3456 to develop as well

* updating paveit with passport-created oauth tables
2017-03-31 15:43:37 -07:00
snipe 934b39268d Merge remote-tracking branch 'origin/develop' 2016-09-06 10:35:33 -07:00
snipe 5cf1c8dfa3 Added DB DUMP PATH to docker.env 2016-08-23 15:51:05 -07:00
timwsuqld 8232cefbba Fix path to snipeit-ssl.crt (#2428) 2016-08-16 13:03:55 -07:00
Brady Wetherington f145d6cc8c Change README to point to new documentation site 2016-07-26 13:56:40 -07:00
Brady Wetherington 5e0cc241a0 Forgot to add the new docker.env file 2016-06-02 20:35:05 -07:00
Brady Wetherington 008482203e Fixes to Dockerfile, updated docker/develop.sh for new options. 2016-05-14 16:46:53 -07:00
Brady Wetherington f03ecd9d08 Update docker support for upcoming v3 2016-05-14 15:43:46 -07:00
snipe fe00b0e401 Version 3 - hold onto your butts 2016-03-25 01:18:05 -07:00