]> git.openstreetmap.org Git - rails.git/history - app/views/user/suspended.html.erb
Resolve conflict
[rails.git] / app / views / user / suspended.html.erb
2013-01-15 Tom HughesMerge branch 'master' into notes
2013-01-14 Saman Bemel-BenrudSite cleanup
2012-08-22 Tom HughesMerge branch 'master' into openstreetbugs
2012-03-13 Tom HughesDon't escape HTML in the "user suspended" message
2010-07-28 Tom HughesMerge branch 'master' into openid
2010-07-28 Tom HughesMerge branch 'master' into openstreetbugs
2010-07-20 Tom HughesMake the suspended user view work again
2010-06-07 Tom HughesMerge branch 'master' into openstreetbugs
2010-05-16 Tom HughesMerge branch 'master' into openid
2010-05-16 Ævar Arnfjörð Bjar... Change user.suspended.body so translators don't have...
2010-05-07 Tom HughesMerge branch 'master' into openstreetbugs
2010-05-07 Tom HughesMerge branch 'master' into openid
2010-05-07 Tom HughesMerge branch 'master' into terms
2010-05-07 Tom HughesRedirect suspended users to an information page