make the "add user" placeholder in composer wider, so other languages can fit into that
fixes bug when modifying the category of a topic but cancelling the edit
Basic Heroku integration
Apache2 Configuration Sample

Sample Virtualhost showing how to:proxy requests to thinserver cluster,
Server static files locally, set headers for downstream server to cache
static assets, exclude mod_security rules that interfere with Discourse.
Merge pull request #461 from richp10/master

Sample Apache2 configuration
- Mobile Reply-as-new fix
- Documentation
Keep a jQuery object of hidden login form
Merge pull request #423 from nverba/heroku-integration

Basic Heroku integration
Merge pull request #449 from kubabrecka/composer_wider_placeholder

make the "add user" placeholder in composer wider, so other languages can fit into that
Merge pull request #450 from ZogStriP/fixes-category-bug-on-cancel

fixes bug when modifying the category of a topic but cancelling the edit
Let's ignore `structure.sql` - it doesn't seem necessary and just causes merge
conflicts.
FIX: On refresh, wouldn't say "You liked this"
FIX: Hide topics list when loading new topics by category
Change layout of the admin dashboard
cs translation update + pseudolocalization
see: https://github.com/rails-api/active_model_serializers/pull/233
Merge pull request #463 from kubabrecka/cs_update15

cs translation update + pseudolocalization
Use one request to fetch dashboard report data and check version
Merge pull request #3 from discourse/master

fast forward