diff options
| author | Fire Demon <firedemon@creature.cafe> | 2020-10-22 17:34:29 -0500 |
|---|---|---|
| committer | Fire Demon <firedemon@creature.cafe> | 2020-10-22 17:34:29 -0500 |
| commit | adf60e63806a4b8f843ce6722a9086044f0bb5cd (patch) | |
| tree | 722969bdb867727a65aeb78bfdab4fa5f60248a5 /app/models/device.rb | |
| parent | c36dd229f9dcb1d77c46d8db23297fc5781b4a97 (diff) | |
| parent | 36e5c9d45be0e94216b5b92ea8749a00bb68e0e3 (diff) | |
Merge remote-tracking branch 'upstream/master' into merge-glitch
Diffstat (limited to 'app/models/device.rb')
0 files changed, 0 insertions, 0 deletions