wvengen 923b579bd1 Merge branch 'master' into article-dialog ... Conflicts: app/assets/stylesheets/bootstrap_and_overrides.css.less		2013-12-06 14:26:50 +01:00
..
assets	Merge branch 'master' into article-dialog	2013-12-06 14:26:50 +01:00
controllers	Merge branch 'master' into allow-no-nickname	2013-11-18 11:42:49 +01:00
documents	i18n simple_form move of fax pdf	2013-10-09 23:41:15 +02:00
helpers	make heading_helper work with empty _short translation	2013-11-24 01:59:44 +01:00
inputs	Improved tasks.	2012-10-08 21:52:03 +02:00
mailers	user display changes in model and mailer	2013-09-22 14:38:56 +02:00
models	make simple_form see that first_name is required	2013-12-03 22:04:22 +01:00
views	Merge branch 'master' into article-dialog	2013-12-06 14:26:50 +01:00
workers	Merge remote-tracking branch 'fsmanuel/master' into master.	2013-07-18 18:48:49 +02:00