← Back to branch summary

~xibo-maintainers/xibo/tempel

« back to all changes in this revision

Viewing changes to lib/Entity/Application.php

  • Committer: GitHub
  • Author(s): Dan Garner
  • Date: 2017-02-14 08:53:21 UTC
  • mfrom: (552.1.1)
  • Revision ID: git-v1:28b5a08b8293d0566da12863dbf2bde244f28804
Merge pull request #237 from maurofmferrao/develop

Complete conflict resolution for https://github.com/xibosignage/xibo-cms/pull/234

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/Entity/Application.php
46
46
     * @var string
47
47
     */
48
48
    public $name;
 
49
    
 
50
    /**
 
51
     * @SWG\Property(
 
52
     *  description="Application Owner"
 
53
     * )
 
54
     * @var string
 
55
     */
 
56
    public $owner;
49
57
 
50
58
    /**
51
59
     * @SWG\Property(