OSDN Git Service

fixed conflicts
authorDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Sun, 6 Nov 2011 19:12:23 +0000 (21:12 +0200)
committerDmitriy Zaporozhets <dzaporozhets@sphereconsultinginc.com>
Sun, 6 Nov 2011 19:12:23 +0000 (21:12 +0200)
commit121f6d04faedad570e6ce1d8d7e235b55c2a9048
tree544c8d17b794a562f52e32008cf6eb88ecb71384
parentb8ca1d62c453fcdb8cb7f65ee793fcd159b4c336
fixed conflicts
app/assets/images/ajax-loader.gif
public/favicon.ico [changed mode: 0644->0755]