Mirrors/roundcubemail
2
0
Fork 0
mirror of https://github.com/roundcube/roundcubemail.git synced 2026-03-04 23:34:01 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
731d190fecb1976d845f6bd18768ee528b007232
roundcubemail/program
History
Aleksander Machniak 731d190fec Merge branch 'tinymce4' 
Conflicts:
	program/js/app.js
	program/js/editor.js
	program/js/tiny_mce/tiny_mce.js
	program/steps/utils/spell_html.inc
2014-05-28 15:52:30 +02:00
..
include
Merge branch 'tinymce4'
2014-05-28 15:52:30 +02:00
js
Merge branch 'tinymce4'
2014-05-28 15:52:30 +02:00
lib
Merge branch 'tinymce4'
2014-05-28 15:52:30 +02:00
localization
Merge branch 'tinymce4'
2014-05-28 15:52:30 +02:00
resources
Fix browser warnings on PDF plugin detection (#1489118)
2013-05-23 15:43:58 +02:00
steps
Merge branch 'tinymce4'
2014-05-28 15:52:30 +02:00