base.html
3.2 KB
-
Merge branch 'master' into issue-sliders · 7bb23000
Conflicts: circle/dashboard/static/dashboard/dashboard.css circle/dashboard/views.py
Kálmán Viktor committed
A prog2-höz tartozó friss repo anyagok itt elérhetőek: https://git.iit.bme.hu/
Conflicts: circle/dashboard/static/dashboard/dashboard.css circle/dashboard/views.py