diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-03-28 13:01:33 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-03-28 13:01:33 +0100 |
| commit | 050efbc12650feaac3e833c4dd740bf090e3dae1 (patch) | |
| tree | 260458c7ff43dd82fc02cc7e5ef0920dd8d2a25b /config/environment.rb | |
| parent | 0418bdd71f59b4d7e9f3498f2990c8b044f310e1 (diff) | |
| parent | 24d5b6f9e39d2ac62a9657c7d19bc8c437b0735b (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: - app/workers/activitypub/distribute_poll_update_worker.rb - config/locales/pl.yml
Diffstat (limited to 'config/environment.rb')
0 files changed, 0 insertions, 0 deletions