[ckan-changes] [ckan/ckan] 38b886: Fix NE locale, which was broken in a bad merge

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/ckan/ckan
  Commit: 38b886b000628563d6b8f821c32de846ed5d439c
      https://github.com/ckan/ckan/commit/38b886b000628563d6b8f821c32de846ed5d439c
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-20 (Tue, 20 Sep 2016)

  Changed paths:
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Fix NE locale, which was broken in a bad merge


  Commit: a33e3808a5b95cfae25b95e91e2fd9d6c7e09045
      https://github.com/ckan/ckan/commit/a33e3808a5b95cfae25b95e91e2fd9d6c7e09045
  Author: amercader <amercadero at gmail.com>
  Date:   2016-09-28 (Wed, 28 Sep 2016)

  Changed paths:
    M ckan/config/environment.py
    M ckan/config/resource_formats.json
    M ckan/lib/jobs.py
    M ckan/plugins/interfaces.py
    M ckan/tests/config/test_environment.py
    M ckan/tests/lib/test_jobs.py
    M ckan/tests/logic/action/test_get.py
    M ckan/tests/test_coding_standards.py
    M ckanext/example_ipermissionlabels/tests/test_example_ipermissionlabels.py
    M doc/contributing/architecture.rst
    M doc/maintaining/background-tasks.rst
    M doc/maintaining/installing/deployment.rst

  Log Message:
  -----------
  Merge branch 'master' into fix-ne-locale


  Commit: c02e1d0ddc47a67dddf02319fd28a92780db41b4
      https://github.com/ckan/ckan/commit/c02e1d0ddc47a67dddf02319fd28a92780db41b4
  Author: Adrià Mercader <amercadero at gmail.com>
  Date:   2016-10-18 (Tue, 18 Oct 2016)

  Changed paths:
    M ckan/i18n/ne/LC_MESSAGES/ckan.mo
    M ckan/i18n/ne/LC_MESSAGES/ckan.po

  Log Message:
  -----------
  Merge pull request #3246 from ckan/fix-ne-locale

Fix NE locale, which was broken in a bad merge


Compare: https://github.com/ckan/ckan/compare/6033c6ab3525...c02e1d0ddc47