Merge branch 'master' of git://github.com/plainblack/webgui

Conflicts:
	docs/changelog/7.x.x.txt
This commit is contained in:
Chris Hanson 2011-03-03 16:16:25 -06:00
commit d1531da722
2 changed files with 15 additions and 16 deletions

View file

@ -6,6 +6,7 @@
- fixed #12063: Return URL from export doesn't work on non-default Thingy's
- fixed #12054: Thingy: Time fields and formatting
- fixed #12061: TimeField form plugin doesn't work with all names.
- fixed #12055: Thingy pagination breaks after editing data
7.10.10
- fixed #12035: Story Manager - make keywords from Story view work