]> git.openstreetmap.org Git - rails.git/history - app/views/user_blocks/index.html.erb
Resolve conflict
[rails.git] / app / views / user_blocks / index.html.erb
2013-01-15 Tom HughesMerge branch 'master' into notes
2013-01-14 Saman Bemel-BenrudSite cleanup
2009-10-13 Tom HughesMerge 17130 from trunk.
2009-10-13 Tom HughesMerged 17073:17076 from trunk.
2009-10-13 Tom HughesMerged 17047 from trunk.
2009-10-13 Tom HughesMerge 17067 from trunk.
2009-10-13 Tom HughesMerged 17256:18123 from trunk.
2009-10-06 Matt AmosFixed bug in _blocks partial when used by the index...
2009-10-06 Tom HughesMerge blocking branch to head.
2009-10-05 Tom HughesMerge 17944:17988 from trunk.
2009-10-02 Matt AmosMerging 17905:17944 from trunk.
2009-10-01 Ævar Arnfjörð Bjar... Add <title> to /blocks and don't Camel Case headings
2009-10-01 Matt AmosMerging 17846:17904 from trunk.
2009-09-29 Matt AmosNew migration to add better auditing to user_roles...
2009-09-29 Matt AmosMerging 17824:17845 from trunk to blocking branch.
2009-09-28 Matt AmosFirst version of blocking feature. Allows both time...