diff options
| author | Matilda Smeds <matildasmeds@users.noreply.github.com> | 2018-12-09 18:28:00 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-12-09 18:28:00 +0100 |
| commit | 317ad3a583fd3dbe06de8724c7fc1c6ded4cae8b (patch) | |
| tree | c7084e546cbc2f289ac8cf2057c1010b4dc7f880 /.gitignore | |
| parent | a87c91cd3993d776dc987ac43b5f6c897baa3206 (diff) | |
| parent | bad1041b82df941d588ae2565f62424d88104933 (diff) | |
| download | rails-317ad3a583fd3dbe06de8724c7fc1c6ded4cae8b.tar.gz rails-317ad3a583fd3dbe06de8724c7fc1c6ded4cae8b.tar.bz2 rails-317ad3a583fd3dbe06de8724c7fc1c6ded4cae8b.zip | |
Merge branch 'master' into guides_session_guidelines_2
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index d44875ed9a..e127852627 100644 --- a/.gitignore +++ b/.gitignore @@ -15,4 +15,4 @@ node_modules/ package-lock.json pkg/ /tmp/ -/yarn.lock
\ No newline at end of file +/yarn-error.log |