don't display debug information when running tests
Merge pull request #1321 from ZogStriP/i-want-my-dots-back

don't display debug information when running tests
Create profile db generator for use when benchmarking a local install http://meta.discourse.org/t/benchmarking-discourse-locally/9070
larger avatar in the "in reply to" box

This one is for @BrentleyJones (cf.
http://meta.discourse.org/t/small-avatar-in-in-reply-to-box/8761)
added the "allow uploaded avatars" site setting
custom avatar support
generate avatars rake task
cleaned up non-used code
updated model annotations
updated locales
updated NGINX sample configuration
Merge pull request #1320 from ZogStriP/local-avatars

Local avatars
allow uploaded avatars by default
Fix typo in german translation
Merge pull request #1319 from adrianlang/patch-1

Fix typo in german translation
unbundled_require for gabbler
credit where it is due
Merge branch 'master' of https://github.com/discourse/discourse