Conflicts: app/assets/stylesheets/projects.css.scss lib/commit_ext.rb |
||
|---|---|---|
| .. | ||
| assets | ||
| tasks | ||
| color.rb | ||
| commit_ext.rb | ||
| file_size_validator.rb | ||
| gitosis.rb | ||
| graph_commit.rb | ||
| utils.rb | ||
Conflicts: app/assets/stylesheets/projects.css.scss lib/commit_ext.rb |
||
|---|---|---|
| .. | ||
| assets | ||
| tasks | ||
| color.rb | ||
| commit_ext.rb | ||
| file_size_validator.rb | ||
| gitosis.rb | ||
| graph_commit.rb | ||
| utils.rb | ||