Merger conflicts.
Merge branch 'master' of ssh://giccero.cloud.ik.bme.hu/cloud Conflicts: miscellaneous/store-server/CloudStore.py
Showing
miscellaneous/devenv/.bash_login
0 → 100644
one/static/icons/document.png
0 → 100644

485 Bytes
one/static/icons/folder-zipper.png
0 → 100644

636 Bytes
one/static/icons/vise-drawer.png
0 → 100644

687 Bytes
one/static/jquery.min.js
0 → 100644
one/static/load-3.gif
0 → 100644

673 Bytes
Please
register
or
sign in
to comment