OSDN Git Service

Merge branch 'dev'
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Wed, 9 Nov 2011 18:29:59 +0000 (20:29 +0200)
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Wed, 9 Nov 2011 18:29:59 +0000 (20:29 +0200)
commitfe1433c37907e9f1ee3c538d9d8cd79754541684
tree51f77ab3ede3872daf7aedc96b84a12f985f0b65
parentc98301d75928544e927be30b3a95b9445e1c5249
parent3f70316c5f264948d74eb9080079be4c78f5aaa9
Merge branch 'dev'

Conflicts:
app/helpers/dashboard_helper.rb
app/helpers/dashboard_helper.rb