Merge branch 'master' of https://github.com/redmatrix/redmatrix

Browse Source

Conflicts:
	doc/to_do_code.bb

...

This commit is contained in:

redmatrix

2015-07-21 17:13:48 -07:00

parent 24ec104819 3ec6a431b6

commit c90f14c066

24 changed files with 48 additions and 29 deletions

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

0

images/default_profile_photos/alpha/175.png → images/default_profile_photos/alpha/300.png

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

0

images/default_profile_photos/black_avatar_1/175.png → images/default_profile_photos/black_avatar_1/300.png

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

0

images/default_profile_photos/black_avatar_2/175.png → images/default_profile_photos/black_avatar_2/300.png

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

0

images/default_profile_photos/blank/175.jpg → images/default_profile_photos/blank/300.jpg

Side by Side Swipe Overlay Before Width:  |  Height:  |  Size: 910 B After Width:  |  Height:  |  Size: 910 B

0

images/default_profile_photos/blank/175.png → images/default_profile_photos/blank/300.png

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

0

images/default_profile_photos/rainbow_man/175.jpg → images/default_profile_photos/rainbow_man/300.jpg

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

0

images/default_profile_photos/rainbow_man/175.png → images/default_profile_photos/rainbow_man/300.png

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

0

images/default_profile_photos/rainbow_man_trans/175.png → images/default_profile_photos/rainbow_man_trans/300.png

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

0

images/default_profile_photos/red_avatar/175.png → images/default_profile_photos/red_avatar/300.png

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

0

images/default_profile_photos/red_koala/175.jpg → images/default_profile_photos/red_koala/300.jpg

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

0

images/default_profile_photos/red_koala/175.png → images/default_profile_photos/red_koala/300.png

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

0

images/default_profile_photos/red_koala_trans/175.png → images/default_profile_photos/red_koala_trans/300.png

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

0

images/default_profile_photos/redmatrix_logo_smiley/175.png → images/default_profile_photos/redmatrix_logo_smiley/300.png

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