Conflicts resolved
authorMarcel Werk <burntime@woltlab.com>
Wed, 20 Jul 2011 12:30:54 +0000 (14:30 +0200)
committerMarcel Werk <burntime@woltlab.com>
Wed, 20 Jul 2011 12:30:54 +0000 (14:30 +0200)
commit7e89fce6b0f2e9c338aefaa763edb9b23cac9426
treefe432dc90883327bfc9dc205646f11eb2baa88de
parent8326ce5ba04e23651aff2b1e42d78a12f395754a
parented524215e916b141385fb0115a36183a49e92d3e
Conflicts resolved
com.woltlab.wcf.notification/files/lib/data/user/notification/UserNotificationEditor.class.php
com.woltlab.wcf.notification/files/lib/system/package/plugin/UserNotificationEventPackageInstallationPlugin.class.php