Gabriela Rodríguez Berón 7fba082c02 Merge branch 'master' into asset-status

2016-12-11 18:56:07 -10:00

..

client

Merge branch 'master' of github.com:coralproject/talk into flag-username

2016-12-09 15:51:13 -05:00

e2e

It fix the status change after merging master in.

2016-12-07 16:37:11 -10:00

models

Merge branch 'master' into ban-user

2016-12-08 13:28:12 -10:00

routes/api

Merge branch 'master' into asset-status

2016-12-11 18:56:07 -10:00

services

Initial commit of asset queuing (#97)

2016-11-28 13:29:39 -05:00

utils

It fix the status change after merging master in.

2016-12-07 16:37:11 -10:00

.eslintrc.json

It fix the status change after merging master in.

2016-12-07 16:37:11 -10:00

mongoose.js

Added asset searching

2016-11-28 15:01:13 -07:00

passport.js

Initial commit of asset queuing (#97)

2016-11-28 13:29:39 -05:00