diff options
| author | Kurtis Rainbolt-Greene <kurtis@rainbolt-greene.online> | 2017-04-07 20:48:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-07 20:48:27 -0700 |
| commit | 1e4453405be08be5f1aa8e650780b273d2e36787 (patch) | |
| tree | 20b43ecfc11d61eac0c2d95a63b8b4bd952b80d3 /app/models/user.rb | |
| parent | 485d75a80500f12fcb59191a79a514fb5ad1c4e3 (diff) | |
| parent | 541c538f9bbd00028b388468b2753b1136f3d5b3 (diff) | |
Merge branch 'master' into patch-2
Diffstat (limited to 'app/models/user.rb')
0 files changed, 0 insertions, 0 deletions