]> git.openstreetmap.org Git - rails.git/history - app/views/user/make_friend.html.erb
Resolve conflict
[rails.git] / app / views / user / make_friend.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-08-15 Tom HughesFixup make_friend and remove_friend properly