Conflicts: vendor/built_in_modules/ad_banner/config/locales/en.yml vendor/built_in_modules/ad_banner/init.rb |
||
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| errors | ||
| helpers | ||
| jobs | ||
| mailer | ||
| models | ||
| uploaders | ||
| views | ||
Conflicts: vendor/built_in_modules/ad_banner/config/locales/en.yml vendor/built_in_modules/ad_banner/init.rb |
||
|---|---|---|
| .. | ||
| assets | ||
| controllers | ||
| errors | ||
| helpers | ||
| jobs | ||
| mailer | ||
| models | ||
| uploaders | ||
| views | ||