sails/src · 0f1cf2b02433f3ddd93ab11e2fe9450ad410105c · yotta / pictogram · GitLab

Find file History

Merge branch 'issue/386' into develop · 9675647e
```
Conflicts:
	sails/src/assets/app/modules/supervisor/controllers/students.js
```
Pablo Molina committed Apr 26, 2016
9675647e

Name	Last commit	Last Update
..
api		Loading commit data...
assets/app		Loading commit data...
config		Loading commit data...
test		Loading commit data...
views		Loading commit data...
.eslintrc		Loading commit data...
.foreverignore		Loading commit data...
Makefile		Loading commit data...
README.md		Loading commit data...
app.js		Loading commit data...
package.json		Loading commit data...