Vinnie Okada 742e6eeed2 Merge branch 'upstream-master' into markdown-preview ... Conflicts: spec/routing/project_routing_spec.rb		2014-12-07 20:25:58 -07:00
..
commits	…
issues	…
source	…
active_tab.feature	…
archived.feature	…
create.feature	…
deploy_keys.feature	…
edit_issuetracker.feature	…
fork.feature	…
forked_merge_requests.feature	…
graph.feature	…
hooks.feature	…
merge_requests.feature	…
network_graph.feature	…
project.feature	…
redirects.feature	…
service.feature	…
shortcuts.feature	…
snippets.feature	…
star.feature	…
team_management.feature	…
wiki.feature	…