summaryrefslogtreecommitdiffstats
path: root/lib/private/Activity/EventMerger.php
diff options
context:
space:
mode:
Diffstat (limited to 'lib/private/Activity/EventMerger.php')
-rw-r--r--lib/private/Activity/EventMerger.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Activity/EventMerger.php b/lib/private/Activity/EventMerger.php
index 6b4846164ed..35c798afe49 100644
--- a/lib/private/Activity/EventMerger.php
+++ b/lib/private/Activity/EventMerger.php
@@ -3,6 +3,7 @@
* @copyright Copyright (c) 2016 Joas Schilling <coding@schilljs.com>
*
* @author Joas Schilling <coding@schilljs.com>
+ * @author Julius Härtl <jus@bitgrid.net>
*
* @license GNU AGPL version 3 or any later version
*
@@ -17,7 +18,7 @@
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/