OSDN Git Service

Merge branch 'wiki'
authorDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Tue, 21 Feb 2012 18:32:43 +0000 (20:32 +0200)
committerDmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>
Tue, 21 Feb 2012 18:32:43 +0000 (20:32 +0200)
commitce8eba89135c901fd4f04f1b2385bdbd23f48766
tree4db466c5318d73fadae737f5de465f44d7bbdfd4
parent5c492a7089f72c50dc7ee26181dda99b5af529b3
parent621bfdb4aa6c5ef2b031f7c4fb7753eb80d7a5b5
Merge branch 'wiki'

Conflicts:
app/views/layouts/_project_menu.html.haml
app/assets/stylesheets/main.scss
app/views/layouts/_project_menu.html.haml