| Age | Commit message (Collapse) | Author | 
|---|
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | This reverts commit 4b92e87d0e33800ceb2b8c2de2b3ddab35512dc5. | 
|  | This reverts commit 7d09ade1b740113be512b95cce9a4ed958ae7a27. | 
|  |  | 
|  |  | 
|  | number. | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | Conflicts:
	Resources/friendship/ui/LikeList.js | 
|  |  | 
|  |  | 
|  |  | 
|  | Conflicts:
	Resources/friendship/ui/LikeList.js | 
|  | middle of the screen when something's happening. | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  |  | 
|  | Conflicts:
	Resources/friendship/ui/LikeList.js | 
|  |  | 
|  | * removed .DS_Store from repo | 
|  |  | 
|  | apparently. | 
|  |  | 
|  |  | 
|  |  | 
|  | -- merged Anqi's stuff with Teddy's things
Conflicts:
	Resources/friendship/ui/ApplicationWindow.js
	Resources/friendship/ui/LikeList.js | 
|  |  | 
|  |  | 
|  |  | 
|  | non-logged-in. Display the right stuff it you're logged in already.
Note: the login window looks like shit, I wonder if there are some things we can do to pretty it up. |