Martin Cech 9496c9e9a4 Merge branch 'release_15.03' into dev ...

Conflicts:
	static/scripts/mvc/library/library-dataset-view.js
	static/scripts/mvc/library/library-folder-view.js
	static/scripts/mvc/library/library-foldertoolbar-view.js
	static/scripts/mvc/library/library-library-view.js
	static/scripts/mvc/library/library-model.js
	static/scripts/packed
	static/scripts/packed/mvc/library/library-dataset-view.js
	static/scripts/packed/mvc/library/library-folder-view.js
	static/scripts/packed/mvc/library/library-foldertoolbar-view.js
	static/scripts/packed/mvc/library/library-library-view.js
	static/scripts/packed/mvc/library/library-model.js

2015-03-25 16:33:44 -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

Fix bad commit (adding files)

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

library-folderrow-view.js

Fix bad commit (adding files)

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

library-foldertoolbar-view.js

Merge branch 'release_15.03' into dev

2015-03-25 16:33:44 -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 'release_15.03' into dev

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