6 Commits

Author	SHA1	Message	Date
David Erwin	2807b2d5b2	Merge master into nod-queue	2016-11-08 13:05:31 -05:00
riley	095f6a319e	remove the 2 requests in settings tests. add Promises	2016-11-08 10:38:49 -07:00
Riley Davis	b10ae913ab	fix a race condition in the tests	2016-11-08 10:07:41 -07:00
gaba	588a8de489	MOve two lines into one.	2016-11-07 18:16:04 -08:00
Riley Davis	601d36f2df	whoops missed some semicolons	2016-11-07 12:54:04 -07:00
Riley Davis	108c50cb95	add tests to settings models/endpoints	2016-11-07 11:28:09 -07:00