Martin Cech 10c915bb62 Merge branch 'dev' into data-lib-work ...

Conflicts:
	static/maps/mvc/library/library-foldertoolbar-view.js.map
	static/scripts/mvc/library/library-foldertoolbar-view.js

also re-grunted

2015-09-28 11:40:35 -04:00

..

library-dataset-view.js

Merge branch 'release_15.03' into dev

2015-03-25 16:33:44 -04:00

library-folder-view.js

Merge branch 'release_15.03' into dev

2015-03-25 16:33:44 -04:00

library-folderlist-view.js

Merge branch 'dev' into data-lib-work

2015-09-28 11:40:35 -04:00

library-folderrow-view.js

Merge branch 'dev' into data-lib-work

2015-09-28 11:40:35 -04:00

library-foldertoolbar-view.js

Merge branch 'dev' into data-lib-work

2015-09-28 11:40:35 -04:00

library-library-view.js

Merge branch 'release_15.03' into dev

2015-03-25 16:33:44 -04:00

library-librarylist-view.js

Fix bad commit (adding files)

2015-03-17 10:47:31 -04:00

library-libraryrow-view.js

Fix bad commit (adding files)

2015-03-17 10:47:31 -04:00

library-librarytoolbar-view.js

Fix bad commit (adding files)

2015-03-17 10:47:31 -04:00

library-model.js

Merge branch 'dev' into data-lib-work

2015-09-28 11:40:35 -04:00