← Back to branch summary

~xibo-maintainers/xibo/tempel

  • 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
Filename Latest Rev Last Changed Committer Comment Size
..
run.php 547 8 years ago GitHub Bugfix/1.8.0 pack1 (#227) * Library Tidy inaccess 3 KB Diff Download File
xtr.php 547 8 years ago GitHub Bugfix/1.8.0 pack1 (#227) * Library Tidy inaccess 180 bytes Diff Download File