Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course

Browse Source

Conflicts:
	app/helpers/application_helper.rb

...

This commit is contained in:

cxt 2016-01-18 10:16:09 +08:00

parent 020135cbc2 86516df88a

commit df57b13ce0

1 changed files with 0 additions and 0 deletions

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

BIN

public/images/homepage_icon2.png

View File

Binary file not shown.

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 10 KiB After Width:  |  Height:  |  Size: 8.2 KiB