Merge remote-tracking branch 'origin/master'

Conflicts: composer.json generator.php library/Cal/Event.php library/Cal/Event/Coordinator.php library/Cal/Gui/Console.php list.php
GrzegorzDrozd · Mar 18, 2015 · f41cc6f · f41cc6f
1 parent 5679039
commit f41cc6f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/library/Cal/Person.php b/library/Cal/Person.php
@@ -5,7 +5,7 @@
  * @license LICENSE.TXT
  * @author  Grzegorz Drozd <[email protected]>
  * @date    2015-03-11
- * @package web_dev_calendar
+ * @package example-calendar
  */
 namespace Cal;
 

diff --git a/library/Cal/Schedule.php b/library/Cal/Schedule.php
@@ -5,7 +5,7 @@
  * @license LICENSE.TXT
  * @author  Grzegorz Drozd <[email protected]>
  * @date    2015-03-11
- * @package web_dev_calendar
+ * @package example-calendar
  */
 
 namespace Cal;