projects / fa-stable.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 95303d7)
*** empty log message ***
authorJanusz Dobrowolski <janusz@frontaccounting.eu>
Wed, 26 Aug 2009 22:12:52 +0000 (22:12 +0000)
committerJanusz Dobrowolski <janusz@frontaccounting.eu>
Wed, 26 Aug 2009 22:12:52 +0000 (22:12 +0000)
CHANGELOG.txt patch | blob | history

diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index 5a65f2cbdbac2c1f015ee926626b5fff197de193..3a6c25b7108fd438b2ac2886e08494cb0287772c 100644 (file)
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -1104,7 +1104,6 @@ $ /sales/includes/db/sales_order_db.inc
   Balance Sheet, PL Statements and Monthly Bread Down reports.
 $ /gl/manage/gl_account_classes.php.  
 
->>>>>>> 1.265
 ------------------------------- Release 2.1.4 ----------------------------------
 30-Jul-2009 Joe Hunt
 ! Release 2.1.4
FrontAccounting stable branch