This repository has been archived on 2022-03-25. You can view files and clone it, but cannot push or open issues or pull requests.

Forwolk 718e814806 Merge branch 'develop' into merge_branch ...

# Conflicts:
#	core/src/main/java/mc/core/Location.java

2018-08-02 15:56:19 +03:00

..

java/mc/core

Merge branch 'develop' into merge_branch

2018-08-02 15:56:19 +03:00

resources

default spring config

2018-06-29 22:58:42 +03:00