Commit Graph

9 Commits (568a995d64c91f339989077da06e381b4b8cb070)

Author SHA1 Message Date
Roman Chvanikov eae991b06a merge develop
5 years ago
Sachin Joshi 6d0ae264fc add listener port and ip option for 'pleroma.instance gen' and enable its test
5 years ago
Roman Chvanikov 371d39e160 Merge develop
5 years ago
Egor Kislitsyn 4f42093220 Remove Uploaders.Swift
5 years ago
Roman Chvanikov 657277ffc0 Resolve conflicts
5 years ago
rinpatch 3ac5ecbac1 Support RUM indexes in the config generator
5 years ago
rinpatch f4009b6706 Fallback to Config if Mix.Config does not exist, even if Config does not
5 years ago
rinpatch 960d6b54e8 use Config in generated config when available
5 years ago
rinpatch e76115989a Move config templates to priv so they can be found in releases
5 years ago