Changeset [36376009997456e6d4775141820719694500ddf3] by Ceeram
Revision 36376009997456e6d4775141820719694500ddf3,
committed by Ceeram
· February 16th, 2012 @ 06:48 PM
Merge branch 'beta' into 2.0
Conflicts:
Plugin/Blog
https://github.com/infinitas/infinitas/commit/36376009997456e6d4775...
19 changed files
-
A
Core/GeoLocation/Lib/GeoIP/GeoIP.php -
A
Core/GeoLocation/Lib/GeoIP/country.dat -
A
Core/GeoLocation/Lib/GeoIP/geoiprecord.php -
A
Core/GeoLocation/Lib/GeoIP/region_vars.php -
R
Core/GeoLocation/Lib/geoip/GeoIP.php -
R
Core/GeoLocation/Lib/geoip/country.dat -
R
Core/GeoLocation/Lib/geoip/geoiprecord.php -
R
Core/GeoLocation/Lib/geoip/region_vars.php -
M
Controller/AppController.php -
M
Core/Contents/View/Elements/content_form.ctp -
M
Core/Events/Lib/EventCore.php -
M
Core/GeoLocation/Controller/Component/GeoLocationComponent.php -
M
Core/GeoLocation/Lib/GeoLocationEvents.php -
M
Core/GeoLocation/Lib/IpLocation.php -
M
Core/Libs/Controller/Component/InfinitasComponent.php -
M
Core/Locks/Model/Behavior/LockableBehavior.php -
M
Plugin/Blog -
M
Plugin/Cms -
M
Plugin/Twitter