Merge remote-tracking branch 'origin/master' into merge-upstream

Conflicts: .env.production.sample app/controllers/auth/confirmations_controller.rb db/schema.rb
2018-02-04 16:36:19 -06:00
parent 530fcc1c14 38e0133e1b
commit a6fb1c58ee
35 changed files with 506 additions and 31 deletions
--- a/1
+++ b/1
@@ -39,6 +39,7 @@ sudo apt-get install \
  libidn11-dev \
  libprotobuf-dev \
  libreadline-dev \
+  libpam0g-dev \
  -y

 # Install rvm