diff options
| author | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 13:45:18 +0100 |
|---|---|---|
| committer | Thibaut Girka <thib@sitedethib.com> | 2019-01-02 15:36:53 +0100 |
| commit | 571d219bb917cefcca7419a0ad4e3889689d5f6a (patch) | |
| tree | 6ab91adcb2c164fd027708e58f5fb96c52474007 /Vagrantfile | |
| parent | b300948526d967aaf5608c93546ee0d54940c0ef (diff) | |
| parent | 66436d08959998be20c6c6bf631177d8c1f3e0d1 (diff) | |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts manually resolved: - app/services/post_status_service.rb - config/locales/simple_form.pl.yml - config/routes.rb - config/webpack/loaders/sass.js - config/webpack/shared.js - package.json - yarn.lock
Diffstat (limited to 'Vagrantfile')
| -rw-r--r-- | Vagrantfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Vagrantfile b/Vagrantfile index a30ba2b34..ada6fa4b2 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -44,7 +44,7 @@ sudo apt-get install \ # Install rvm read RUBY_VERSION < .ruby-version -gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 +gpg --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3 7D2BAF1CF37B13E2069D6956105BD0E739499BDB curl -sSL https://raw.githubusercontent.com/rvm/rvm/stable/binscripts/rvm-installer | bash -s stable --ruby=$RUBY_VERSION source /home/vagrant/.rvm/scripts/rvm |