Viewing all changes in revision 280.
- Committer: Dan Garner
- Date: 2013-06-02 13:15:03 UTC
- mfrom: (279.1.42 server-151-datasets)
- Revision ID: dan@xibo.org.uk-20130602131503-7zv64rbhgvkor02q
Merged server-151-datasets
- files added:
- server/3rdparty/simplepie
- server/3rdparty/simplepie/library
- server/3rdparty/simplepie/library/SimplePie
- server/3rdparty/simplepie/library/SimplePie/Cache
- server/3rdparty/simplepie/library/SimplePie/Content
- server/3rdparty/simplepie/library/SimplePie/Content/Type
- server/3rdparty/simplepie/library/SimplePie/Decode
- server/3rdparty/simplepie/library/SimplePie/Decode/HTML
- server/3rdparty/simplepie/library/SimplePie/HTTP
- server/3rdparty/simplepie/library/SimplePie/Net
- server/3rdparty/simplepie/library/SimplePie/Parse
- server/3rdparty/simplepie/library/SimplePie/XML
- server/3rdparty/simplepie/library/SimplePie/XML/Declaration
- server/theme/default/libraries/ckeditor/plugins/iframe
- server/theme/default/libraries/ckeditor/plugins/iframe/dialogs
- server/theme/default/libraries/ckeditor/plugins/iframe/icons
- server/theme/default/libraries/ckeditor/plugins/iframe/images
- server/theme/default/libraries/ckeditor/plugins/iframe/lang
- files removed:
- server/modules/preview/HtmlTemplate.htm
- files modified:
- server/install/master/data.sql
expand all
collapse all
added
removed
server/theme/default/libraries/ckeditor/plugins/iframe/icons/iframe.png
server/theme/default/libraries/ckeditor/plugins/iframe/images/placeholder.png
