[ckan-changes] [okfn/ckan] 8d0930: Merge branch 'feature-1515-activity-streams' of gi...

[GitHub]

  Branch: refs/heads/feature-1515-activity-streams
  Home:   https://github.com/okfn/ckan
  Commit: 8d0930ec624d13db949f08344b4a82832db2b2c1
      https://github.com/okfn/ckan/commit/8d0930ec624d13db949f08344b4a82832db2b2c1
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Log Message:
  -----------
  Merge branch 'feature-1515-activity-streams' of github.com:okfn/ckan into feature-1515-activity-streams


  Commit: bda3142f5ba2e23bf787f04dba6f7d993388a3df
      https://github.com/okfn/ckan/commit/bda3142f5ba2e23bf787f04dba6f7d993388a3df
  Author: Ross Jones <rossdjones at gmail.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M ckan/tests/functional/test_upload.py

  Log Message:
  -----------
  [xs] Minor change to upload test


  Commit: 2bea431a3386b02b876c278df17152bc1b7c796f
      https://github.com/okfn/ckan/commit/2bea431a3386b02b876c278df17152bc1b7c796f
  Author: Sean Hammond <seanhammond at lavabit.com>
  Date:   2012-01-20 (Fri, 20 Jan 2012)

  Changed paths:
    M ckan/tests/functional/test_upload.py

  Log Message:
  -----------
  Merge branch 'master' of github.com:okfn/ckan into feature-1515-activity-streams


Compare: https://github.com/okfn/ckan/compare/88c239e...2bea431