Merge branch 'master' of git://dev.laptop.org/sugar-toolkit
This commit is contained in:
		
						commit
						341bda0a6b
					
				@ -1,3 +1,3 @@
 | 
			
		||||
sugar/activity/activity.py
 | 
			
		||||
sugar/graphics/alert.py
 | 
			
		||||
sugar/graphics/objectchooser.py
 | 
			
		||||
src/sugar/activity/activity.py
 | 
			
		||||
src/sugar/graphics/alert.py
 | 
			
		||||
src/sugar/graphics/objectchooser.py
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user