Skip to content

Commit

Permalink
Merge branch 'master' of github.com:iCAPLyon1/NotificationBundle
Browse files Browse the repository at this point in the history
  • Loading branch information
ptsavdar committed Apr 10, 2015
2 parents 967518a + b5f55ab commit b908de4
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 71 deletions.
69 changes: 0 additions & 69 deletions Entity/NotifiableInterface.php

This file was deleted.

2 changes: 1 addition & 1 deletion Listener/LogListener.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Claroline\CoreBundle\Event\Log\LogGenericEvent;
use Claroline\CoreBundle\Library\Configuration\PlatformConfigurationHandler;
use JMS\DiExtraBundle\Annotation as DI;
use Icap\NotificationBundle\Entity\NotifiableInterface;
use Claroline\CoreBundle\Event\Log\NotifiableInterface;
use Icap\NotificationBundle\Manager\NotificationManager as NotificationManager;

/**
Expand Down
2 changes: 1 addition & 1 deletion Manager/NotificationManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
use Claroline\CoreBundle\Library\Configuration\PlatformConfigurationHandler;
use Doctrine\ORM\NoResultException;
use Icap\NotificationBundle\Entity\FollowerResource;
use Icap\NotificationBundle\Entity\NotifiableInterface;
use Claroline\CoreBundle\Event\Log\NotifiableInterface;
use Icap\NotificationBundle\Entity\Notification;
use Icap\NotificationBundle\Entity\NotificationViewer;
use Doctrine\ORM\EntityManager;
Expand Down

0 comments on commit b908de4

Please sign in to comment.