Conflicts: vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_acknowledgements/index.html.erb vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/index.html.erb |
||
|---|---|---|
| .. | ||
| ask_mailer | ||
| panel/ask | ||
Conflicts: vendor/built_in_modules/ask/app/views/panel/ask/back_end/ask_acknowledgements/index.html.erb vendor/built_in_modules/ask/app/views/panel/ask/front_end/ask_questions/index.html.erb |
||
|---|---|---|
| .. | ||
| ask_mailer | ||
| panel/ask | ||