b80dd3d242
Merge branch 'master' into non-interactive-aws-install Conflicts: doc/installation.md Fix merge mess in installation.md |
||
---|---|---|
.. | ||
backend | ||
encode.rb | ||
graph_commit.rb | ||
inline_diff.rb | ||
logger.rb | ||
markdown.rb | ||
merge.rb | ||
satellite.rb | ||
theme.rb |