Julian Lam 7afe8a32f6 Merge branch 'master' into develop

2017-03-29 15:26:49 -04:00

..

admin

fixed leftover merge conflict artifact

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

client

Merge remote-tracking branch 'origin/master' into develop

2017-03-24 14:37:39 -04:00

installer

ESlint no-unused-vars

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

modules

Merge branch 'master' into develop

2017-03-07 14:35:49 -05:00

ajaxify.js

fix lint

2017-03-10 22:36:09 +03:00

app.js

fixes #5536

2017-03-28 12:13:44 -04:00

overrides.js

ESlint no-use-before-define

2017-02-18 18:55:33 -07:00

require-config.js

ESlint strict

2017-02-18 02:23:47 -07:00

sockets.js

ESlint no-use-before-define

2017-02-18 18:55:33 -07:00

utils.js

Merge branch 'master' into develop

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

widgets.js

ESlint no-useless-concat, no-mixed-spaces-and-tabs

2017-02-18 14:42:15 -07:00