19b78c717a
Conflicts: app/views/layouts/_right_menu.html.erb |
||
---|---|---|
.. | ||
assets | ||
controllers | ||
errors | ||
helpers | ||
jobs | ||
mailer | ||
models | ||
uploaders | ||
views |
19b78c717a
Conflicts: app/views/layouts/_right_menu.html.erb |
||
---|---|---|
.. | ||
assets | ||
controllers | ||
errors | ||
helpers | ||
jobs | ||
mailer | ||
models | ||
uploaders | ||
views |