Holger Just 0c87f611e9 Merge branch 'master' into unstable ... Conflicts: config/locales/bg.yml config/locales/bs.yml config/locales/ca.yml config/locales/cs.yml config/locales/da.yml config/locales/de.yml config/locales/el.yml config/locales/en-GB.yml config/locales/es.yml config/locales/eu.yml config/locales/fa.yml config/locales/fi.yml config/locales/fr.yml config/locales/gl.yml config/locales/he.yml config/locales/hr.yml config/locales/hu.yml config/locales/id.yml config/locales/it.yml config/locales/ja.yml config/locales/ko.yml config/locales/lt.yml config/locales/lv.yml config/locales/mk.yml config/locales/mn.yml config/locales/nl.yml config/locales/no.yml config/locales/pl.yml config/locales/pt-BR.yml config/locales/pt.yml config/locales/ro.yml config/locales/ru.yml config/locales/sk.yml config/locales/sl.yml config/locales/sr-YU.yml config/locales/sr.yml config/locales/sv.yml config/locales/th.yml config/locales/tr.yml config/locales/uk.yml config/locales/vi.yml config/locales/zh-TW.yml config/locales/zh.yml db/migrate/20100217010520_add_custom_filter_to_auth_sources.rb lib/chili_project/version.rb		2012-01-04 16:41:10 +01:00
..
environments	Update copyright for 2012	2012-01-03 20:36:40 +01:00
initializers	Fix trailing whitespace	2012-01-03 20:43:08 +01:00
locales	Merge branch 'master' into unstable	2012-01-04 16:41:10 +01:00
additional_environment.rb.example	Allow a config/additional_environment.rb file to customize the Rails::Initializer.	2009-11-08 02:16:42 +00:00
boot.rb	Update copyright for 2012	2012-01-03 20:36:40 +01:00
configuration.yml.example	Adds support for SCM/LDAP passwords encryption in the database (#7411).	2011-04-16 15:16:03 -07:00
database.yml.example	[#174] Change Redmine to ChiliProject in the user configuration files	2011-02-24 15:24:20 -08:00
environment.rb	Merge branch 'master' into unstable	2012-01-04 16:41:10 +01:00
preinitializer.rb	Update copyright for 2012	2012-01-03 20:36:40 +01:00
routes.rb	Merge branch 'master' into unstable	2012-01-04 16:41:10 +01:00
settings.yml	[#792] Add settings for confirmation emails are sent for incoming mail	2011-12-26 17:38:19 -08:00