OSDN Git Service
(root)
/
pettanr
/
pettanr.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'master' of git.sourceforge.jp:/gitroot/pettanr/pettanr into v06heroku
[pettanr/pettanr.git]
/
config
/
environment.rb
diff --git
a/config/environment.rb
b/config/environment.rb
index
c6824f7
..
c9f04e5
100644
(file)
--- a/
config/environment.rb
+++ b/
config/environment.rb
@@
-2,6
+2,7
@@
require File.expand_path('../application', __FILE__)
require 'RMagick'
require 'rest_client'
+require 'aws/s3'
require 'inspire'
require 'picture_io'