Conflicts: app/assets/javascripts/discourse/controllers/composer_controller.js app/assets/javascripts/discourse/views/composer_view.js config/locales/client.en.yml |
||
|---|---|---|
| .. | ||
| environments | ||
| initializers | ||
| locales | ||
| apache2.conf.sample | ||
| application.rb | ||
| boot.rb | ||
| cdn.yml.sample | ||
| clock.rb | ||
| database.yml.sample | ||
| discourse.pill.sample | ||
| environment.rb | ||
| fog_credentials.yml.sample | ||
| jshint.yml | ||
| nginx.sample.conf | ||
| redis.yml.sample | ||
| routes.rb | ||