[ckan-changes] [ckan/ckan] 03a638: Disable travis on 2.5.x as it's broken and we have...

Tue May 8 20:59:04 UTC 2018

  Branch: refs/heads/2.5
  Home:   https://github.com/ckan/ckan
  Commit: 03a638f1e52883290e1f6b56a7a3d181c685e0db
      https://github.com/ckan/ckan/commit/03a638f1e52883290e1f6b56a7a3d181c685e0db
  Author: amercader <amercadero at gmail.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

  Changed paths:
    R .travis.yml

  Log Message:
  -----------
  Disable travis on 2.5.x as it's broken and we have CircleCI


  Commit: 9e91573c82ac73447da6f597fd584f1893a07709
      https://github.com/ckan/ckan/commit/9e91573c82ac73447da6f597fd584f1893a07709
  Author: amercader <amercadero at gmail.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

  Changed paths:
    M CHANGELOG.rst
    M dev-requirements.txt
    A doc/_static/css/custom.css
    A doc/_templates/layout.html
    M doc/conf.py

  Log Message:
  -----------
  Merge branch 'release-v2.5.9' of github.com:ckan/ckan into release-v2.5.9


  Commit: 097b036b8559a3277c80eb78f11d3cee573d45af
      https://github.com/ckan/ckan/commit/097b036b8559a3277c80eb78f11d3cee573d45af
  Author: amercader <amercadero at gmail.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

  Changed paths:
    A doc/_substitutions.rst
    M doc/conf.py
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst

  Log Message:
  -----------
  Fix merge errors


  Commit: 05e7eaafa2b21bd90d0513d8d404a2ae857a8a44
      https://github.com/ckan/ckan/commit/05e7eaafa2b21bd90d0513d8d404a2ae857a8a44
  Author: amercader <amercadero at gmail.com>
  Date:   2018-05-08 (Tue, 08 May 2018)

  Changed paths:
    R .travis.yml
    A doc/_substitutions.rst
    M doc/conf.py
    M doc/maintaining/installing/install-from-package.rst
    M doc/maintaining/installing/install-from-source.rst

  Log Message:
  -----------
  Merge branch 'release-v2.5.9' into 2.5


Compare: https://github.com/ckan/ckan/compare/021630f03eff...05e7eaafa2b2
      **NOTE:** This service been marked for deprecation: https://developer.github.com/changes/2018-04-25-github-services-deprecation/

      Functionality will be removed from GitHub.com on January 31st, 2019.