delta.frontaccounting.com Git - fa-stable.git/commit

projects / fa-stable.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b6ae2dd bc3bd9d)

author	Janusz Dobrowolski <janusz@frontaccounting.eu>
	Sat, 18 Apr 2015 09:41:45 +0000 (11:41 +0200)
committer	Janusz Dobrowolski <janusz@frontaccounting.eu>
	Sat, 18 Apr 2015 09:42:56 +0000 (11:42 +0200)
commit	d1babda7c01b314d35fb89f2d195553b55936532
tree	7b29aba0a3389bda228ecc8091c09b6f3ce8aa88	tree \| snapshot
parent	b6ae2ddcd0cbc571edd01157ca1c8d44bbe071ef	commit \| diff
parent	bc3bd9da4239732574b92842d5573e3316c749de	commit \| diff

Merging latest changes from stable branch up to 2.3.24

admin/db/users_db.inc	diff1 \|	diff2 \|	blob \| history
admin/security_roles.php	diff1 \|	diff2 \|	blob \| history
gl/includes/db/gl_db_trans.inc	diff1 \|	diff2 \|	blob \| history
includes/current_user.inc	diff1 \|	diff2 \|	blob \| history
includes/db_pager.inc	diff1 \|	diff2 \|	blob \| history
includes/session.inc	diff1 \|	diff2 \|	blob \| history
includes/ui/ui_controls.inc	diff1 \|	diff2 \|	blob \| history
reporting/rep304.php	diff1 \|	diff2 \|	blob \| history
reporting/rep409.php	diff1 \|	diff2 \|	blob \| history
reporting/reports_main.php	diff1 \|	diff2 \|	blob \| history
update.html	diff1 \|	diff2 \|	blob \| history

FrontAccounting stable branch