← 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
..
master 251 10 years ago Dan Garner Migrated from BZR and moved files to root folder. Diff
steps 474 9 years ago Dan Garner Merge pull request #125 from dasgarner/upgrader U Diff