OSDN Git Service

(root) / wvm / gitlab.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23187d6 1d1b518)
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)
Conflicts:
app/assets/images/ajax-loader.gif
public/favicon.ico


Trivial merge
About OSDN
Find Software
Develop Software
Help