Merge upstream and update Gemfile.lock

This commit is contained in:
2020-01-26 03:31:36 -05:00
parent 12bc37ec52
commit b1f816924a
50 changed files with 1654 additions and 202 deletions

2
.atom-build.yml Normal file
View File

@@ -0,0 +1,2 @@
cmd: '{FILE_ACTIVE} {FILE_ACTIVE_PATH}'
name: 'Run build.sh'