diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-09-30 12:25:13 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-09-30 12:25:13 -0500 |
| commit | 22e7a7947900cc974715b0c9d1d6b1a44d2ed1eb (patch) | |
| tree | 918ab95c4f465c9c1fbfcd6706483e3310a38ce5 /config/initializers/locale.rb | |
| parent | 63046c8cb9df8e797d53566f2050313d757b089b (diff) | |
| parent | b5edf30160eab3776e44b34325a4ea00d9f71dc5 (diff) | |
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'config/initializers/locale.rb')
0 files changed, 0 insertions, 0 deletions