github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-02-01 02:18:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
5e08427dd3
discourse/app/assets
History
Brentley Jones 5e08427dd3 Merge branch 'master' into fixed_modals 
Conflicts:
	app/assets/javascripts/discourse/templates/modal/modal.js.handlebars
	app/assets/stylesheets/application/modal.css.scss
2013-07-16 18:58:49 +00:00
..
fonts upgrade font awesome to version 3.2.1, use scss instead of css for the include. 2013-07-09 10:06:57 +10:00
images Add Stack Exchange onebox 2013-06-10 09:27:13 -07:00
javascripts Merge branch 'master' into fixed_modals 2013-07-16 18:58:49 +00:00
stylesheets Merge branch 'master' into fixed_modals 2013-07-16 18:58:49 +00:00