Commit graph

7 commits

Author SHA1 Message Date
David Baldwynn
04e71be14a
Merge branch '2.20' into fixSlowAnalyticsBug 2017-11-06 14:47:01 -08:00
David Baldwynn
68235423c8
Merge branch 'master' into fixSlowAnalyticsBug 2017-11-06 14:26:04 -08:00
David Baldwynn
b29d5bad36 fixed admin setup script 2017-11-06 13:44:29 -08:00
David Baldwynn
a40ecad008 added aggregating for form analytics 2017-11-05 19:40:28 -08:00
David Baldwynn
a77a59c3ba Merge branch '2.20' into emailNotifications 2017-11-05 16:26:09 -08:00
David Baldwynn
492783ec49 built correct dist files 2017-11-05 15:50:55 -08:00
David Baldwynn
15d023c133 fixed editable variables in textAngular editor 2017-11-02 14:29:02 -07:00