Fix merge issue
3ef295c7019f
Actions

Authored by aubort on Sep 20 2017, 18:00.

Description

Fix merge issue

Details

Committed

Sep 20 2017, 18:00

Pushed

Sep 20 2017, 18:00

Parents

Branches

Unknown

Tags

Unknown

Changes (12)

rPH3ef295c7019f

src/applications/diffusion/controller/DiffusionRepositoryManagePanelsController.php

src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php

src/applications/diffusion/management/DiffusionRepositoryDocumentationManagementPanel.php

src/applications/diffusion/management/DiffusionRepositoryManagementPanel.php

src/applications/diffusion/management/DiffusionRepositoryStatusManagementPanel.php

src/applications/diffusion/management/DiffusionRepositoryStorageManagementPanel.php

src/applications/diffusion/management/DiffusionRepositoryURIsManagementPanel.php

src/applications/diffusion/view/DiffusionBrowseTableView.php

src/applications/phame/controller/post/PhamePostViewController.php

src/applications/phame/editor/PhamePostEditor.php

src/applications/phame/storage/PhamePost.php

src/applications/phame/xaction/PhamePostViewsTransaction.php

Fix merge issue3ef295c7019fActions

Description

Details

Changes (12)

rPH3ef295c7019f

src/applications/diffusion/controller/DiffusionRepositoryManagePanelsController.php

src/applications/diffusion/management/DiffusionRepositoryBranchesManagementPanel.php

src/applications/diffusion/management/DiffusionRepositoryDocumentationManagementPanel.php

src/applications/diffusion/management/DiffusionRepositoryManagementPanel.php

src/applications/diffusion/management/DiffusionRepositoryStatusManagementPanel.php

src/applications/diffusion/management/DiffusionRepositoryStorageManagementPanel.php

src/applications/diffusion/management/DiffusionRepositoryURIsManagementPanel.php

src/applications/diffusion/view/DiffusionBrowseTableView.php

src/applications/phame/controller/post/PhamePostViewController.php

src/applications/phame/editor/PhamePostEditor.php

src/applications/phame/storage/PhamePost.php

src/applications/phame/xaction/PhamePostViewsTransaction.php

Fix merge issue
3ef295c7019f
Actions