[ckan-changes] [ckan/ckan] 24819e: Merge fix again

[GitHub]

  Branch: refs/heads/3484_revision_ui_removal2
  Home:   https://github.com/ckan/ckan
  Commit: 24819e7f300a91c7a95d28c9e5896ea360b69c05
      https://github.com/ckan/ckan/commit/24819e7f300a91c7a95d28c9e5896ea360b69c05
  Author: David Read <david.read at hackneyworkshop.com>
  Date:   2018-05-12 (Sat, 12 May 2018)

  Changed paths:
    R ckan/controllers/revision.py
    M ckan/tests/legacy/functional/api/test_activity.py
    M ckan/views/user.py

  Log Message:
  -----------
  Merge fix again



      **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.