[fc] Repository: plone.app.theming

Branch: refs/heads/master
Date: 2016-02-29T09:35:12-06:00
Author: nathan.vangheem () <nathan.vangheem@wildcardcorp.com>
Commit: plone/plone.app.theming@73cd1d3

fix case where wrong theme could show up selected in control panel

Files changed:
M CHANGES.rst
M src/plone/app/theming/browser/controlpanel.py
Repository: plone.app.theming
Branch: refs/heads/master
Date: 2016-02-29T23:27:39+01:00
Author: Jens W. Klein (jensens) <jk@kleinundpartner.at>
Commit: plone/plone.app.theming@05263ff

Merge pull request #97 from plone/rules-conflict

fix case where wrong theme could show up selected in control panel

Files changed:
M CHANGES.rst
M src/plone/app/theming/browser/controlpanel.py