doc: changelogs (resolve conflicts)
Conflicts: hledger-lib/CHANGES hledger-web/CHANGES
This commit is contained in:
		
							parent
							
								
									53aee0e236
								
							
						
					
					
						commit
						5d403c2bb7
					
				| @ -2,9 +2,12 @@ API-ish changes in hledger-lib. For user-visible changes, see the hledger change | ||||
| 
 | ||||
| 0.24 (unreleased) | ||||
| 
 | ||||
| - allow transformers 0.4* | ||||
| - clarify debug helpers a little | ||||
| 
 | ||||
| 0.23.3 (2014/9/12) | ||||
| 
 | ||||
| - allow transformers 0.4* | ||||
| 
 | ||||
| 0.23.2 (2014/5/8) | ||||
| 
 | ||||
| - postingsReport: also fix date sorting of displayed postings (#184) | ||||
|  | ||||
| @ -12,7 +12,10 @@ See also the hledger changelog. | ||||
| - report filtering fixes | ||||
| - upgrade jquery to 2.1.1, bootstrap to 3.1.1, drop select2, add typeahead, cookie, hotkeys | ||||
| - refactoring | ||||
| - allow warp 3, wai-handler-launch 3 | ||||
| 
 | ||||
| 0.23.3 (2014/9/12) | ||||
| 
 | ||||
| - web: remove warp, wai-handler-launch upper bounds (fixes #205) | ||||
| 
 | ||||
| 0.23.2 (2014/5/8) | ||||
| 
 | ||||
|  | ||||
| @ -1,3 +1,7 @@ | ||||
| 0.23.3 (2014/9/12) | ||||
| 
 | ||||
| - allow text 1.2+ (fixes #207) | ||||
| 
 | ||||
| 0.23.2 (2014/5/8) | ||||
| 
 | ||||
| - register: also fix date sorting of postings (#184) | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user