Learn more about cloning repositories
You have read-only access
Merge branch 'master' of http://git.b2e.kz/scm/~didar.burmaganov/court-main Conflicts: court-app/app/index.html court-app/app/scripts/app.js
