Gregory horion 0d5d2af27f give me the rool url in the 2.0.0rc please ... Conflicts: config/routes.rb		2012-01-28 16:12:10 +11:00
..
initializers	Removed the locomotive init.	2012-01-25 22:24:13 +11:00
locales	Use the 2.0.0.rc branch for the custom_fields gem	2012-01-26 02:41:31 +01:00
assets.yml	restore production settings + fix broken tests + apply the coding convention on the recently modified haml file	2011-07-23 01:26:16 +02:00
cucumber.yml	Ruby MRI 1.9.3 Compatability Fixes	2011-08-25 23:28:56 +02:00
routes.rb	give me the rool url in the 2.0.0rc please	2012-01-28 16:12:10 +11:00