Peter Jaszkowiak a8add6477c Fix merge conflicts

2017-04-12 21:29:54 -06:00

..

admin

Fix failing test

2017-04-11 21:53:17 -06:00

client

Merge pull request #5576 from pichalite/zxcvbn

2017-04-09 16:52:52 -04:00

installer

ESlint no-unused-vars

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

modules

Fix #5588, translator ignores unclosed tokens

2017-04-12 20:34:31 -06: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

Deprecate utils.walk, remove prototype modification

2017-04-08 21:02:06 -06:00

widgets.js

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

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