Merge branch 'upstream' into staging/rails-4.0

Browse Source

Conflicts:
	Gemfile.lock

...

This commit is contained in:

darkbushido 2015-05-05 11:00:38 -05:00

parent cbd53ce8a4 9a629da783

commit ee3d28eaea

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