David Baldwynn 9ff247fde7 Merge branch 'master' into 2.20		2017-11-21 13:39:27 -08:00
..
controllers	Merge pull request #262 from tellform/fixResponseCountOnFormList	2017-11-13 23:02:03 -08:00
libs	fixed editable variables in textAngular editor	2017-11-02 14:29:02 -07:00
models	Merge pull request #262 from tellform/fixResponseCountOnFormList	2017-11-13 23:02:03 -08:00
routes	Merge branch '2.20' into fixSlowAnalyticsBug	2017-11-06 14:47:01 -08:00
sockets	added aggregating for form analytics	2017-11-05 19:40:28 -08:00
tests	fixed editable variables in textAngular editor	2017-11-02 14:29:02 -07:00
views	Merge branch 'master' into 2.20	2017-11-21 13:39:27 -08:00