snipe f3526eccb9 Merge branch 'features/textarea-custom-field' into develop ...

# Conflicts:
#	public/js/build/all.js
#	public/js/build/vue.js
#	public/js/build/vue.js.map
#	public/js/dist/all.js
#	public/mix-manifest.json

2018-07-05 12:37:07 -07:00

..

assets

Merge branch 'features/textarea-custom-field' into develop

2018-07-05 12:37:07 -07:00

lang

End help text with a period consistently. (#5731)

2018-06-21 07:13:29 -07:00

macros

Adds textarea as a custom field type

2018-06-21 09:35:04 -07:00

views

Merge branch 'features/textarea-custom-field' into develop

2018-07-05 12:37:07 -07:00