-
Merge branch 'master' into avatar-cropping · fb6d7df3Johann Pardanaud authored
Conflicts: app/models/user.rb
fb6d7df3
This project manages its dependencies using
Bundler.
Learn more
×
BigW Consortium Gitlab
Conflicts: app/models/user.rb