sails/src/assets/app/modules/supervisor/controllers · 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 Browse Files

Name	Last commit	Last Update
..
setup.js		Loading commit data...
students.js		Loading commit data...
supervisor.js		Loading commit data...