« back to all changes in this revision
Viewing changes to web/wiki/inc/lang/la/conflict.txt
- Committer: Chad Heuschober
- Date: 2011-06-06 13:37:45 UTC
- mfrom: (1.1.1244 trunk)
- mto: This revision was merged to the branch mainline in revision 17.
- Revision ID: chad.heuschober@mail.cuny.edu-20110606133745-850mdvnjtv392zta
Pulled in most recent batch of changes from the cuny sps trunk.
- files added:
- apps/frontend/lib/form/doctrine/agHost.class.php
- apps/frontend/lib/packages/agMessagePackage/modules/message
- apps/frontend/lib/packages/agMessagePackage/modules/message/actions
- apps/frontend/lib/packages/agMessagePackage/modules/message/templates
- web/wiki/data/attic/manual/user/organizations
- web/wiki/data/media/manual/user/facilities
- web/wiki/data/media/manual/user/organization
- web/wiki/data/media/manual/user/organizations
- web/wiki/data/meta/manual/user/organizations
- web/wiki/data/pages/manual/user/organizations
- web/wiki/data/pages/playground
- web/wiki/data/pages/wiki/ebook
- web/wiki/lib/plugins/config/lang/et
- web/wiki/lib/plugins/info/lang
- web/wiki/lib/plugins/info/lang/sl
- web/wiki/lib/plugins/plugin/lang/et
- web/wiki/lib/plugins/popularity/lang/et
- web/wiki/lib/plugins/revert/lang/et
- web/wiki/lib/plugins/safefnrecode
- web/wiki/lib/plugins/usermanager/lang/et
- data/agInstall
- files renamed:
- apps/frontend/lib/util/agScenarioGenerator.class.php => apps/frontend/lib/util/agShiftGeneratorHelper.class.php
- apps/frontend/lib/util/agScenarioStaffGeneratorHelper.class.php => apps/frontend/lib/util/agStaffGeneratorHelper.class.php
- data/fixtures/examples/agAddressFormat.yml => data/fixtures/agAddressFormat.yml
- data/fixtures/examples/agAddressValue_usa_states.yml => data/fixtures/agAddressValue_usa_states.yml
- data/fixtures/examples/agGeoSource.yml => data/fixtures/agGeoSource.yml
- data/fixtures/examples/agPhoneFormat.yml => data/fixtures/agPhoneFormat.yml
- data/fixtures/examples/ => data/samples/
- data/fixtures/agPersonName.yml => data/samples/agPersonName.yml
- web/uploads/ => data/uploads/
- files modified:
- .bzrignore
- apps/frontend/lib/packages/agEventPackage/lib/model/doctrine/PluginagEventFacilityResource.class.php
- apps/frontend/lib/packages/agStaffPackage/lib/model/doctrine/PluginagStaffAllocationStatus.class.php
- lib/vendor/symfony/lib/plugins/sfDoctrinePlugin/test/functional/fixtures/config/doctrine/linked_schema.yml
added
removed
web/wiki/inc/lang/la/conflict.txt
