Sam 29c2423daf Merge branch 'master' into vdom ... # Conflicts: # app/assets/javascripts/discourse/views/post.js.es6		2016-02-19 14:09:31 +11:00
..
fonts	UX: Upgrade Font Awesome to 4.5.0	2015-12-10 17:19:23 -05:00
images	Add styling & assets for google docs placeholder oneboxes	2015-10-14 17:09:48 -07:00
javascripts	Merge branch 'master' into vdom	2016-02-19 14:09:31 +11:00
stylesheets	Add some padding to whisper icons	2016-02-16 12:47:54 -05:00