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
..
assets	Merge pull request #5049 from kpcyrd/aspect-edit-fix	2014-07-01 14:49:53 +02:00
controllers	help page ported to bootstrap	2014-07-01 05:56:49 -03:00
helpers	Code style + allow aspects to be nil	2014-06-17 21:19:17 +02:00
mailers	Reports email notification; wrong recipient	2014-06-23 15:54:25 -04:00
models	Merge pull request #4945 from hpetru/notifications	2014-07-01 14:33:54 +02:00
presenters	Merge pull request #4836 from MrZYX/message_renderer	2014-04-13 15:00:46 +03:00
uploaders
views	Revert "Fix toggling services for mobile bookmarklet"	2014-06-19 21:47:34 +03:00
workers	It is now possible to report comments	2014-05-15 07:23:43 -04:00