projects / oweals / karmaworld.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 411aab1 f5ab355)
Merge branch 'master' of github.com:FinalsClub/karmaworld
authorSeth Woodworth <seth@sethish.com>
Thu, 18 Apr 2013 17:10:29 +0000 (13:10 -0400)
committerSeth Woodworth <seth@sethish.com>
Thu, 18 Apr 2013 17:10:29 +0000 (13:10 -0400)
1  2 
karmaworld/assets/css/global.css patch | diff1 | diff2 | blob | history

diff --cc karmaworld/assets/css/global.css
Simple merge
Unnamed repository; edit this file 'description' to name the repository.