discourse/app
Sam Saffron 10aa1923a4 Merge branch 'master' into vdom
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2016-02-23 17:07:01 +11:00
..
assets Merge branch 'master' into vdom 2016-02-23 17:07:01 +11:00
controllers FIX: don't try to optimize large PNGs (takes too much time) 2016-02-22 12:57:24 +01:00
helpers Added tertiary color to digest 2016-02-22 07:02:21 -06:00
jobs FEATURE: pending flags reminder is sent as a group message to staff instead of sending an email to the contact email site setting. 2016-02-19 15:21:18 -05:00
mailers FEATURE: keep original title when sending email notifications about a PM 2016-02-23 01:34:16 +01:00
models Merge branch 'master' into vdom 2016-02-23 15:58:46 +11:00
serializers FEATURE: allow users to control how many previous replies they get 2016-02-19 13:57:07 +11:00
services FEATURE: keep original title when sending email notifications about a PM 2016-02-23 01:34:16 +01:00
views Merge branch 'master' into vdom 2016-02-22 15:28:07 -05:00