Conflicts: app/assets/javascripts/orbitdesktop.js  | 
			||
|---|---|---|
| .. | ||
| asset_uploader.rb | ||
| avatar_uploader.rb | ||
| file_asset_uploader.rb | ||
| image_uploader.rb | ||
| location_uploader.rb | ||
				
					
						Conflicts: app/assets/javascripts/orbitdesktop.js  | 
			||
|---|---|---|
| .. | ||
| asset_uploader.rb | ||
| avatar_uploader.rb | ||
| file_asset_uploader.rb | ||
| image_uploader.rb | ||
| location_uploader.rb | ||