Changeset [c5c59a27f5f171455025d51708ebcec292717b73] by Fred Dirkse - OIC Group, Inc
September 15th, 2011 @ 03:48 PM
Fixing merge conflict
https://github.com/exponentcms/exponent-cms/commit/c5c59a27f5f17145...
Committed by Fred Dirkse - OIC Group, Inc
- A framework/core/assets/images/retweet.png
- A framework/modules/report/views/report/show_payment_summary.tpl
- A framework/modules/twitter/assets/images/rt.png
- R framework/modules/twitter/assets/images/arrow-retweet.png
- M external/ExtPrograms.csv
- M framework/core/subsystems/expDateTime.php
- M framework/modules/administration/views/administration/configure_site.tpl
- M framework/modules/report/controllers/reportController.php
- M framework/modules/twitter/controllers/twitterController.php
- M framework/modules/twitter/views/twitter/showall.tpl
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
Bug Tracker for Exponent CMS