99777cab2a
Conflicts: config/initializers/rails_footnotes.rb |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
application.rb | ||
boot.rb | ||
database.yml | ||
environment.rb | ||
gitosis.yml | ||
routes.rb |
99777cab2a
Conflicts: config/initializers/rails_footnotes.rb |
||
---|---|---|
.. | ||
environments | ||
initializers | ||
locales | ||
application.rb | ||
boot.rb | ||
database.yml | ||
environment.rb | ||
gitosis.yml | ||
routes.rb |