Commit Graph

4 Commits

Author SHA1 Message Date
jl777
e73b2055c6 Merge branch 'beta' into mergemaster
# Conflicts:
#	src/main.cpp
2018-04-16 10:16:01 +03:00
Mihail Fedorov
da49ef71b3 docker updated 2016-12-05 19:26:22 +03:00
Mihail Fedorov
5bf2ae888b Reduce image size 2016-12-04 13:35:31 +01:00
Mihail Fedorov
32c666174f Docker files added 2016-11-19 05:14:22 +03:00