Skip to content

GitLab

Explore

Sign in
Register

Primary navigation

Project

T

tarantool
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

362b6e25

Commit 362b6e25 authored 8 years ago by ocelot-inc

Downloads
- Plain Diff

Merge Conflict, attempted resolution

parents 4b37f81d b2ee33bd

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

doc/sphinx/dev_guide/building_documentation.rst 39 additions, 19 deletions

doc/sphinx/dev_guide/building_documentation.rst
doc/sphinx/dev_guide/documentation_guidelines.rst 134 additions, 0 deletions

doc/sphinx/dev_guide/documentation_guidelines.rst
doc/sphinx/dev_guide/index.rst 1 addition, 0 deletions

doc/sphinx/dev_guide/index.rst
doc/www/content/newsite/index.yml 0 additions, 30 deletions

doc/www/content/newsite/index.yml
doc/www/theme/static/design.css 1 addition, 0 deletions

doc/www/theme/static/design.css
doc/www/theme/templates/index.html 8 additions, 52 deletions

doc/www/theme/templates/index.html
src/box/box.cc 10 additions, 0 deletions

src/box/box.cc
src/lib/small 1 addition, 1 deletion

src/lib/small
test/box-tap/cfg.result 6 additions, 1 deletion

test/box-tap/cfg.result
test/box-tap/cfg.test.lua 6 additions, 1 deletion

test/box-tap/cfg.test.lua

with 206 additions and 104 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment