Julian Lam 250bb4b011 fixed leftover merge conflict artifact

2017-03-15 10:23:25 -04:00

..

advanced

ESlint no-unused-vars

2017-02-18 15:05:36 -07:00

appearance

ESlint no-unused-vars

2017-02-18 15:05:36 -07:00

extend

ESlint no-unused-vars

2017-02-18 15:05:36 -07:00

general

fixed leftover merge conflict artifact

2017-03-15 10:23:25 -04:00

manage

Merge branch 'master' into develop

2017-02-24 12:46:40 -05:00

modules

Fix admin Search

2017-03-05 11:38:40 +01:00

settings

ACP: added tagsinput to other fields that are "comma separated"

2017-03-10 14:36:35 -05:00

.eslintrc

ESlint no-undef, remove global comments

2017-02-17 22:03:55 -07:00

admin.js

ESlint no-multi-assign

2017-02-18 18:06:28 -07:00

settings.js

prevent tagsinput initialization from flagging as unsaved

2017-03-10 14:40:10 -05:00