Merge branch 'master' into dev-siliconbrain
Conflicts: cloud/urls.py firewall/fw.py
Showing

290 KB

836 Bytes

38.7 KB

39.8 KB

427 Bytes
miscellaneous/homepage/IK Cloud_files/css
0 → 100644

1.6 KB

673 Bytes

655 Bytes

1.49 KB

678 Bytes

881 Bytes
miscellaneous/homepage/index.html
0 → 100644
miscellaneous/ircbot/post-receive
0 → 100755
miscellaneous/ircbot/tracrss/check.sh
0 → 100755
miscellaneous/laborclient/store_gui.py
0 → 100755
one/locale/hu/LC_MESSAGES/django.po
0 → 100644
one/static/cloud.js
0 → 100644
one/static/icons/arrow-curve-090.png
0 → 100644

637 Bytes
one/static/icons/folder--plus.png
0 → 100644

589 Bytes
one/static/knockout.min.js
0 → 100644
one/templates/box-filelist.html
0 → 100644
one/templates/main.html
deleted
100644 → 0
school/admin.py
0 → 100644
school/migrations/0005_auto.py
0 → 100644
school/migrations/0006_auto.py
0 → 100644
store/migrations/0002_auto__del_setting.py
0 → 100644
store/static/store/gui.js
0 → 100644
store/templates/store/gui.html
0 → 100644
Please
register
or
sign in
to comment