OSDN Git Service

Merge branch 'dev'
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Sun, 6 Nov 2011 19:07:56 +0000 (21:07 +0200)
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Sun, 6 Nov 2011 19:07:56 +0000 (21:07 +0200)
commitb8ca1d62c453fcdb8cb7f65ee793fcd159b4c336
tree361d84dee1af508820ae70684c142176fb191413
parent23187d60c4eb3eb2d51459ab18fd16da9caa5b58
parent1d1b5186c3cbf85fb8f539b241ced29c314a3ff2
Merge branch 'dev'

Conflicts:
app/assets/images/ajax-loader.gif
public/favicon.ico