Skip to content

Commit

Permalink
Merge branch 'master' into kyle/fileUploads
Browse files Browse the repository at this point in the history
  • Loading branch information
kyleqhua committed May 8, 2020
2 parents 6ef68e4 + 2a36ed5 commit c9a2960
Show file tree
Hide file tree
Showing 55 changed files with 1,510 additions and 370 deletions.
2 changes: 1 addition & 1 deletion app.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
"description": "Internal dashboard for Unloop to help them build a pipeline from prison to tech.",
"repository": "https://github.com/calblueprint/unloop",
"scripts": {
"postdeploy": "bundle exec rails db:schema:load db:seed"
"postdeploy": "bundle exec rails db:seed"
},
"env": {
"SMTP_HOST": {
Expand Down
4 changes: 4 additions & 0 deletions app/assets/images/action_item_step_0.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
7 changes: 7 additions & 0 deletions app/assets/images/action_item_step_1.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 4 additions & 0 deletions app/assets/images/action_item_step_2.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
104 changes: 104 additions & 0 deletions app/assets/images/error_mailbox.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
86 changes: 86 additions & 0 deletions app/assets/images/load_mail.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit c9a2960

Please sign in to comment.