diff options
| author | ThibG <thib@sitedethib.com> | 2019-01-11 10:53:58 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-11 10:53:58 +0100 |
| commit | 2cfa55185a5fc7d93a160a4e9a4730aae6725b0f (patch) | |
| tree | c57169b5a3d717f4e68b8ec5d2d6e220d1456434 /vendor | |
| parent | d1da0a1086fa25f22739277fbf32ba1b3745317d (diff) | |
| parent | 394525e32994e605093c87d3a9fad2a4202f3401 (diff) | |
Merge pull request #885 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'vendor')
| -rw-r--r-- | vendor/.keep (renamed from vendor/assets/javascripts/.keep) | 0 | ||||
| -rw-r--r-- | vendor/assets/stylesheets/.keep | 0 |
2 files changed, 0 insertions, 0 deletions
diff --git a/vendor/assets/javascripts/.keep b/vendor/.keep index e69de29bb..e69de29bb 100644 --- a/vendor/assets/javascripts/.keep +++ b/vendor/.keep diff --git a/vendor/assets/stylesheets/.keep b/vendor/assets/stylesheets/.keep deleted file mode 100644 index e69de29bb..000000000 --- a/vendor/assets/stylesheets/.keep +++ /dev/null |