OSDN Git Service

Merge branch 'dev' into issue-184
authorAleksei Kvitinskii <aleksei.wm@gmail.com>
Mon, 7 Nov 2011 19:29:28 +0000 (21:29 +0200)
committerAleksei Kvitinskii <aleksei.wm@gmail.com>
Mon, 7 Nov 2011 19:29:28 +0000 (21:29 +0200)
commit444b69ddc2382489dbd01304b605c3be5af75f28
tree3cced0b681ddd18631541d0b72644c042c23db90
parent4a1b70f7b2d55bf26be35a2544e3b8e76bdc0585
parent9054f64c530625e5f6f555daf3f9d6a741c177bb
Merge branch 'dev' into issue-184

Conflicts:
app/views/layouts/project.html.haml
app/views/layouts/project.html.haml