David Baldwynn 43ce60b985 Merge branch 'master' into 2.20

2017-11-05 16:24:19 -08:00

..

controllers

got server tests to pass

2017-11-02 11:14:25 -07:00

libs

got all tests to pass

2017-10-10 22:07:13 -07:00

models

removed unused code from user.server.model.js

2017-10-29 20:14:40 -07:00

routes

got rid of unnessecary user middleware

2017-10-29 20:11:58 -07:00

sockets

disabled cache

2017-10-07 06:14:36 -04:00

tests

got server tests to pass

2017-11-02 11:14:25 -07:00

views

Merge branch 'master' of github.com:tellform/tellform

2017-11-05 16:14:15 -08:00