diff options
| author | Francis Irving <francis@mysociety.org> | 2010-07-13 23:54:46 +0100 |
|---|---|---|
| committer | Francis Irving <francis@mysociety.org> | 2010-07-13 23:54:46 +0100 |
| commit | 59395b3bdf19aed7bf5f77656afa6c31dad7e138 (patch) | |
| tree | b6e4c9f9e5b4a9f792a550ce3af727ae32b1cba1 /vendor/ruby-ole/lib/ole/file_system.rb | |
| parent | 452ac41f05f655a9fd23c8df4796f26632c23050 (diff) | |
| parent | da2c0aaf5f0d07baa3a355033a92d5dd295f2f13 (diff) | |
Merge branch 'master' into francis-profile-photo
Conflicts:
app/views/user/show.rhtml
commonlib
spec/controllers/user_controller_spec.rb
Diffstat (limited to 'vendor/ruby-ole/lib/ole/file_system.rb')
| -rw-r--r-- | vendor/ruby-ole/lib/ole/file_system.rb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/vendor/ruby-ole/lib/ole/file_system.rb b/vendor/ruby-ole/lib/ole/file_system.rb new file mode 100644 index 000000000..24d330a92 --- /dev/null +++ b/vendor/ruby-ole/lib/ole/file_system.rb @@ -0,0 +1,2 @@ +# keeping this file around for now, but will delete later on... +require 'ole/storage/file_system' |