diaspora/app/assets
Jonne Haß 1959f0d939 Merge branch 'hotfix/0.4.1.1' into develop
Conflicts:
	Changelog.md
	config/defaults.yml
2014-10-03 17:14:55 +02:00
..
images try working around precompilation bug by committing generated sprites, not nice but luckily they don't change often 2014-08-24 01:02:35 +02:00
javascripts Fixed deformation of getting started popovers 2014-09-17 21:13:22 -05:00
stylesheets fix profile badge too much margin [ci skip] 2014-09-18 22:30:57 +02:00
templates Merge branch 'hotfix/0.4.1.1' into develop 2014-10-03 17:14:55 +02:00