kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity
AlternC/bureau
History
alban 5a31dc9b96 Merge branch 'stable-3.1' 
Conflicts:
	bureau/class/m_action.php
	bureau/class/m_bro.php
	bureau/class/m_dom.php
	debian/changelog
	install/mysql.sql
	install/upgrades/3.3.0~a.sql
 		2014-09-15 15:25:27 +02:00
..
admin Merge branch 'stable-3.1' 2014-09-15 15:25:27 +02:00
class Merge branch 'stable-3.1' 2014-09-15 15:25:27 +02:00
locales new translations 2014-03-28 17:02:44 +01:00
index.php We should let this file for a while... 2012-10-30 09:31:45 +00:00