diff options
| author | Valery Sizov <vsv2711@gmail.com> | 2011-11-13 15:57:34 +0200 |
|---|---|---|
| committer | Valery Sizov <vsv2711@gmail.com> | 2011-11-13 15:57:34 +0200 |
| commit | 762946995ea9d477f00fea19e5040bf4dd437cb9 (patch) | |
| tree | b94dc6074eeba1b49c0ed6427cb847f89227fd4f /app/models/note.rb | |
| parent | dc844f013848ee1fa7721173bda3f3fc0ed0b8ba (diff) | |
| parent | 2f790001a029144f7a614d49a123cd1037f6398c (diff) | |
| download | gitlab-ce-762946995ea9d477f00fea19e5040bf4dd437cb9.tar.gz | |
Merge remote-tracking branch 'origin/master' into network_graph
Conflicts:
app/assets/stylesheets/projects.css.scss
lib/commit_ext.rb
Diffstat (limited to 'app/models/note.rb')
0 files changed, 0 insertions, 0 deletions