https://src.bluestatic.org / bugdar.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 690c96d 178db23)
Merge branch 'isso3' to do all 2.0 work on 'master'
authorRobert Sesek <rsesek@bluestatic.org>
Thu, 8 Jan 2009 18:52:06 +0000 (10:52 -0800)
committerRobert Sesek <rsesek@bluestatic.org>
Thu, 8 Jan 2009 18:52:06 +0000 (10:52 -0800)
Conflicts:
admin/global.php
admin/index.php
includes/framework: Updated framework version to 3.2.1

1  2 
includes/framework patch | diff1 | diff2 | blob | history

diff --cc includes/framework
index f43a67bd362838ad8fcfe3a7d0532b4d0dbf25c5,c289b359fa57962d635386910b814b4835fa6578..a6048a8d395fa692b050514e33d41422de02f757
--- 1/includes/framework
--- 2/includes/framework
+++ b/includes/framework
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit f43a67bd362838ad8fcfe3a7d0532b4d0dbf25c5
 -Subproject commit c289b359fa57962d635386910b814b4835fa6578
++Subproject commit a6048a8d395fa692b050514e33d41422de02f757
Open-source PHP-MySQL bug tracking system that has customizable CSS/XHTML templates, email notifications, Atom syndication, internationalization support, and a very simple setup.