diaspora/app/assets
Jonne Haß 5a3d329703 Merge pull request #5049 from kpcyrd/aspect-edit-fix
Fix broken aspect-edit sidebar update

Conflicts:
	app/assets/javascripts/aspect-edit-pane.js
2014-07-01 14:49:53 +02:00
..
images It is now possible to report comments 2014-05-15 07:23:43 -04:00
javascripts Merge pull request #5049 from kpcyrd/aspect-edit-fix 2014-07-01 14:49:53 +02:00
stylesheets Merge pull request #5047 from pablocubico/feature/user-menu-styles-minor-fix 2014-07-01 14:17:04 +02:00
templates added title_header key for the Help header, only for EN lang so far 2014-07-01 06:19:29 -03:00