diff options
| author | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2013-01-15 00:52:25 +0100 |
|---|---|---|
| committer | Riyad Preukschas <riyad@informatik.uni-bremen.de> | 2013-01-15 00:52:25 +0100 |
| commit | 30227869482bbbdbfea153f2b45ef3bb9a9fd218 (patch) | |
| tree | aff64071116447092751770d2896998f62d1b44a /doc/code/index.html | |
| parent | 8ee5fce9d64b70d8981896457484fae622d142c9 (diff) | |
| parent | aca0caa8cc1a6bd481f87dd810284e69d3747050 (diff) | |
| download | gitlab-ce-30227869482bbbdbfea153f2b45ef3bb9a9fd218.tar.gz | |
Merge commit 'master' into discussions
Conflicts:
app/assets/stylesheets/sections/notes.scss
app/contexts/notes/load_context.rb
app/models/project.rb
app/observers/note_observer.rb
app/roles/votes.rb
app/views/commit/show.html.haml
app/views/merge_requests/_show.html.haml
app/views/merge_requests/diffs.js.haml
app/views/merge_requests/show.js.haml
app/views/notes/_note.html.haml
features/steps/project/project_merge_requests.rb
spec/models/note_spec.rb
Diffstat (limited to 'doc/code/index.html')
| -rw-r--r-- | doc/code/index.html | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/doc/code/index.html b/doc/code/index.html new file mode 100644 index 00000000000..c7011386dd7 --- /dev/null +++ b/doc/code/index.html @@ -0,0 +1,13 @@ +<!DOCTYPE html + PUBLIC "-//W3C//DTD XHTML 1.0 Frameset//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd"> +<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <title>RDoc Documentation</title> +</head> +<frameset cols="300,*" frameborder="1" border="1" bordercolor="#999999" framespacing="1"> + <frame src="panel/index.html" title="Search" name="panel" /> + <frame src="files/app/assets/fonts/OFL_txt.html" name="docwin" /> +</frameset> +</html> |