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

..

admin

Merge branch '2.20' into features/missing

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

base/css

Merge branch 'master' into 2.20

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

config

Merge branch '2.20' into emailNotifications

2017-11-05 16:26:09 -08:00

services

fixed editable variables in textAngular editor

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

tests/unit

removed empty authentication controller test

2017-11-02 11:37:33 -07:00

forms.client.module.js

merged with master

2017-11-11 20:05:06 -08:00