OSDN Git Service

Merge branch 'feature/dashboardfeed' of https://github.com/alexleutgoeb/gitlabhq...
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Mon, 8 Oct 2012 10:52:07 +0000 (13:52 +0300)
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Mon, 8 Oct 2012 10:52:07 +0000 (13:52 +0300)
commit624abdfc72f57da5650e239c8dd20e14f2f9a186
treea70b0ff9931d3e9ba6e694e4a37b74032450250d
parentfd2320849f07071258ec045b414fe2baa0dea9da
parent987e351de7fb6c98094a1c099c717dacb3f1416e
Merge branch 'feature/dashboardfeed' of https://github.com/alexleutgoeb/gitlabhq into alexleutgoeb-feature/dashboardfeed

Conflicts:
app/decorators/event_decorator.rb