Merge branch 'master' into 0.6.7
This commit is contained in:
commit
f584e16197
|
@ -1,4 +1,3 @@
|
|||
<<<<<<< HEAD
|
||||
#
|
||||
# Copyright (C) 2011, B3log Team
|
||||
#
|
||||
|
@ -24,4 +23,4 @@
|
|||
name=owmx-3.0
|
||||
version=2.0.5
|
||||
forSolo=0.6.6
|
||||
memo=Refers to http://lightdian.b3log.org
|
||||
memo=Refers to http://dx.b3log.org
|
||||
|
|
Loading…
Reference in New Issue