Merge branch 'feature/info' of git.friedli.info:manuel/uhr into feature/info

Browse source

Conflicts:
	info/index.html

...

This commit is contained in:

Manuel Friedli 2014-03-05 23:01:09 +01:00

parent 58f63c569a 3233bcd017

commit 5586771b0e

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 is not available