OSDN Git Service

Merge branch 'master' into fix-theme-path
authorDaniel Bachhuber <d@danielbachhuber.com>
Tue, 20 Aug 2013 14:12:09 +0000 (07:12 -0700)
committerDaniel Bachhuber <d@danielbachhuber.com>
Tue, 20 Aug 2013 14:12:09 +0000 (07:12 -0700)
commitc940bda9c7e621b2ad56a25f39fa45de383f10a8
treeb4c8367bc09e783797473610d9fc1cc3dffd7c0e
parentf3c5d482d381360c88019ef2fdfb7a57f79ee921
parent3eeebbefb5a526ad7f7e72e9bbab95970f524c21
Merge branch 'master' into fix-theme-path

Conflicts:
features/theme.feature
features/theme.feature
php/commands/theme.php