Merge branch 'hotfix/fix_rent'
Merge branch 'develop' of github.com:bigbag/term-flask
fix: обновил версии js, обновил шаблоны
fix: after pull
Merge remote-tracking branch 'origin/master' into develop
Merge branch 'develop' of github.com:bigbag/term-flask into develop
Merge branch 'hotfix/replace_time_format' into develop