Commit Graph

2 Commits

Author SHA1 Message Date
blitzmann
c0f8099f49 Merge branch 'master' into i18n
# Conflicts:
#	staticdata/fsd_binary/typedogma.json
#	staticdata/fsd_lite/evetypes.json
#	staticdata/phobos/metadata.0.json
#	staticdata/phobos/traits.json
2020-08-02 18:54:31 -04:00
blitzmann
5c7e3fe782 Remove LSF, convert staticdata files to split files 2020-06-27 22:27:28 -04:00