diff options
| author | Johann Pardanaud <pardanaud.j@gmail.com> | 2016-02-16 21:53:51 +0300 |
|---|---|---|
| committer | Johann Pardanaud <pardanaud.j@gmail.com> | 2016-02-16 21:53:51 +0300 |
| commit | fb6d7df347016726d84155d18b6d6f406d0121e9 (patch) | |
| tree | 9529bd4b546feeff391ca5a9db0a445f76a9521b /app/uploaders/avatar_uploader.rb | |
| parent | 78588cfca15348ba062d33061c79df3cfa6b9883 (diff) | |
| parent | 7cc4b73942a0620678cd7e058d6dcde0ae71f4e6 (diff) | |
Merge branch 'master' into avatar-cropping
Conflicts:
app/models/user.rb
Diffstat (limited to 'app/uploaders/avatar_uploader.rb')
0 files changed, 0 insertions, 0 deletions