wodka 423154790a Merge branch '2.20' into features/missing ...

# Conflicts:
#	app/models/form.server.model.js
#	package-lock.json
#	package.json
#	public/modules/forms/admin/views/admin-form.client.view.html
#	public/modules/forms/admin/views/directiveViews/form/edit-submissions-form.client.view.html

2019-07-11 23:22:49 +02:00

..

controllers

Merge branch 'master' into 2.20

2019-07-11 23:18:55 +02:00

libs

fixed editable variables in textAngular editor

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

models

Merge branch '2.20' into features/missing

2019-07-11 23:22:49 +02: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

2019-07-11 23:18:55 +02:00