master #2

Merged
peri4 merged 4 commits from master into release 2020-04-29 13:18:30 +03:00

4 Commits

Author SHA1 Message Date
2c7528fe6d Merge remote-tracking branch 'remotes/origin/release'
# Conflicts:
#	.gitmodules
2020-04-29 13:16:46 +03:00
c38ad9f907 deploy 2020-04-29 12:58:42 +03:00
92d469750e c 2020-04-28 14:44:17 +03:00
ced89be7c8 clean 2020-04-28 14:42:42 +03:00