| 
							
							
								 Brion Vibber | 59119482ca | Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x Conflicts:
	actions/hostmeta.php
	actions/imsettings.php
	classes/User.php
	lib/adminpanelaction.php
	lib/channel.php
	lib/default.php
	lib/router.php
	lib/util.php | 2010-10-04 12:54:36 -07:00 |  | 
			
				
					| 
							
							
								 Siebrand Mazeland | ca3d803f1d | Update i18n/L10n. | 2010-09-18 10:25:13 +02:00 |  | 
			
				
					| 
							
							
								 Evan Prodromou | a319b40c97 | common_cache_key() -> Cache::key() | 2010-09-06 10:07:43 -04:00 |  | 
			
				
					| 
							
							
								 Evan Prodromou | 8f81762d68 | common_memcache() => Cache::instance() | 2010-09-06 09:56:45 -04:00 |  | 
			
				
					| 
							
							
								 Craig Andrews | c08d7f1aa4 | Minify inline JS and CSS (can be disable in configuration) | 2009-12-05 00:41:22 -05:00 |  | 
			
				
					| 
							
							
								 Craig Andrews | f4fc8481e2 | Separate out some common code | 2009-12-04 23:17:19 -05:00 |  | 
			
				
					| 
							
							
								 Craig Andrews | 01b089d9be | Added minify plugin | 2009-12-04 12:36:00 -05:00 |  |