Peter Jaszkowiak 23540afaeb Resolve merge conflicts

2017-02-18 19:14:39 -07:00

..

database

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

helpers

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

mocks

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

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

.eslintrc

ESlint no-unused-vars

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

authentication.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

build.js

ESlint padded-blocks

2017-02-18 02:32:24 -07:00

categories.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

controllers-admin.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

controllers.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

database.js

ESlint padded-blocks

2017-02-18 02:32:24 -07:00

groups.js

ESlint no-multi-assign

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

messaging.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

meta.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

mocha.opts

Fix return and tests

2017-02-17 20:36:13 +00:00

notifications.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

pagination.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

plugins.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

posts.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

rewards.js

ESlint no-unused-vars

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

search-admin.js

ESlint indent

2017-02-18 02:38:03 -07:00

search.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

socket.io.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

topics.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

translator.js

ESlint quotes

2017-02-18 01:56:23 -07:00

uploads.js

ESlint object-curly-spacing

2017-02-18 12:30:49 -07:00

user.js

Resolve merge conflicts

2017-02-18 19:14:39 -07:00

utils.js

ESlint no-useless-escape, no-else-return

2017-02-18 14:27:26 -07:00