Merge branch 'develop' of https://github.com/jaesivsm/liquidprompt into jaesivsm-develop

Browse Source

Conflicts:
	liquidprompt

...

This commit is contained in:

nojhan 2013-05-22 20:45:56 +02:00

parent e10595144a d5c276d0fc

commit 7b8413763a

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available