Dennis Schubert b41007fae7 Merge branch 'stable' into develop		2015-06-04 04:18:34 +02:00
..
connecting.rb	replace Rails.logger with logging-logger	2015-06-04 04:17:15 +02:00
querying.rb	replace Rails.logger with logging-logger	2015-06-04 04:17:15 +02:00
social_actions.rb	Revert "Revert "Merge pull request #5852 from margori/3393-activity-stream-keeping-retracted-participations""	2015-05-04 00:43:41 +02:00