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

Adds syntax highlighting #27

Merged
merged 10 commits into from
Jan 29, 2015
Merged

Adds syntax highlighting #27

merged 10 commits into from
Jan 29, 2015

Conversation

emersion
Copy link
Collaborator

See #26, #13.

@emersion emersion mentioned this pull request Jan 24, 2015
7 tasks
@voldyman
Copy link
Owner

can you rebase this branch on voldyman:discount-2.1.8 ?

@emersion
Copy link
Collaborator Author

Done!

return file.get_uri ();
}

var data_dirs = Environment.get_system_data_dirs ();
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should use Constants.PKGDATADIR to find the file

@voldyman
Copy link
Owner

ok, we need to merge this branch which requires that you rebase it on the current master (which i am not going to touch for a few days)

i thought i had merged this sometime ago, thanks for the contribution ❤️

@emersion
Copy link
Collaborator Author

Just merged with upstream and added assets caching ;-)

@voldyman
Copy link
Owner

👍

voldyman added a commit that referenced this pull request Jan 29, 2015
@voldyman voldyman merged commit 68e166b into voldyman:master Jan 29, 2015
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.

None yet

2 participants