commit 1b4839501798b7a2edc70ea2b44496b3829eb40f
| author | 斟酌 鵬兄 <tgckpg@gmail.com> |
|---|
| date | 2016-06-03T16:11:06Z |
|---|
| subject | Merge branch 'Astro' of AstroGit:BotanJS-Astro into Astro |
|---|
commit 1b4839501798b7a2edc70ea2b44496b3829eb40f
Merge: 3474ebd 581ac57
Author: 斟酌 鵬兄 <tgckpg@gmail.com>
Date: 2016-06-03T16:11:06Z
Merge branch 'Astro' of AstroGit:BotanJS-Astro into Astro
botanjs/src/Astro/Blog/Layout/MainFrame.css | 17 ++++++++++++++++
botanjs/src/Astro/Blog/Layout/MainFrame.js | 24 ++++++++++++++++------
botanjs/src/Astro/Starfall/Element/Header.css | 29 +--------------------------
3 files changed, 36 insertions(+), 34 deletions(-)