Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Dust support. #48

Merged
merged 2 commits into from
Jul 6, 2013
Merged

Conversation

zaygraveyard
Copy link
Collaborator

Add support for compiling dustjs-linkedin.

Add support for compiling dustjs-linkedin.
…add-dust-support

Conflicts:
	src/app/html/en_us/main.html
	src/app/html/en_us/settings.html
	src/app/html/en_us/template.html
	src/app/html/ja_jp/main.html
	src/app/html/ja_jp/settings.html
	src/app/html/ja_jp/template.html
	src/app/html/zh_cn/main.html
	src/app/html/zh_cn/settings.html
	src/app/html/zh_cn/template.html
	src/app/scripts/appConfig.js
@zaygraveyard
Copy link
Collaborator Author

I merged the changes, anything else?

@oklai
Copy link
Owner

oklai commented Jul 6, 2013

That's all.
ÔÚ 2013-7-6 ÏÂÎç3:13£¬"Ziad Khoury Hanna" [email protected]дµÀ£º

I merged the changes, anything else?

¡ª
Reply to this email directly or view it on GitHubhttps://github.com//pull/48#issuecomment-20550335
.

oklai added a commit that referenced this pull request Jul 6, 2013
@oklai oklai merged commit 1021bec into oklai:master Jul 6, 2013
@zaygraveyard zaygraveyard deleted the feature/add-dust-support branch July 6, 2013 14:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants