[ckan-changes] [okfn/ckan] 18f306: Re-compiled main.css

[GitHub]

  Branch: refs/heads/3021-logout-without-js
  Home:   https://github.com/okfn/ckan
  Commit: 18f306c39f12daf211eb7fa72b69155d45a09c5a
      https://github.com/okfn/ckan/commit/18f306c39f12daf211eb7fa72b69155d45a09c5a
  Author: John Martin <me at johnmart.in>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  Re-compiled main.css


  Commit: d031ee63779df3f0f89688142ab7c97b88111289
      https://github.com/okfn/ckan/commit/d031ee63779df3f0f89688142ab7c97b88111289
  Author: tobes <toby.junk at gmail.com>
  Date:   2012-11-20 (Tue, 20 Nov 2012)

  Changed paths:
    M ckan/public/base/css/main.css

  Log Message:
  -----------
  Merge branch 'master' into 3021-logout-without-js

Conflicts:
	ckan/public/base/css/main.css

recreated


Compare: https://github.com/okfn/ckan/compare/403d36d44d31...d031ee63779d