Philipp Tessenow 5363c28e75 Merge commit '1e84433' into feature/rails3 ...

Conflicts:
	app/helpers/journals_helper.rb
	app/views/mailer/issue_edit.text.html.rhtml
	app/views/mailer/issue_edit.text.plain.rhtml

2013-02-26 13:31:22 +01:00

..

assets

Merge commit '563d054' into feature/rails3

2013-02-26 13:26:22 +01:00

controllers

Merge commit '964d46f' into feature/rails3

2013-02-26 13:23:27 +01:00

helpers

Merge commit '1e84433' into feature/rails3

2013-02-26 13:31:22 +01:00

mailers

fix the way we pass the sort params

2012-11-21 15:02:21 +01:00

models

fix class load order

2013-02-22 18:02:52 +01:00

views

Merge commit '563d054' into feature/rails3

2013-02-26 13:26:22 +01:00