Merge branch 'master' into desktop_harry

Browse Source

Conflicts:
	app/assets/stylesheets/style.css.erb

...

This commit is contained in:

Christophe Vilayphiou committed 2012-04-06 19:02:39 +08:00

2 parents 8471120c63 253f4bcb54

commit f65bb9b323

5 files changed

+903 -857

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

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

No files matched your search

app/assets/stylesheets/style.css.erb

+872 -853

File diff suppressed because it is too large. Load diff