Bharadwaja G 7f902e41c7 Resolved conflicts		2017-08-24 12:21:43 +05:30
..
activities.php	french translation	2017-01-16 14:51:33 +01:00
auth.php	auth.php: fix some spelling issues in french translation	2017-07-22 23:45:08 +02:00
common.php	Resolved conflicts	2017-08-24 12:21:43 +05:30
components.php	french translation	2017-01-16 14:51:33 +01:00
entities.php	Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master	2017-08-01 19:24:33 +01:00
errors.php	Merge branch 'master' of git://github.com/Abijeet/BookStack into Abijeet-master	2017-08-01 19:24:33 +01:00
pagination.php	french translation	2017-01-16 14:51:33 +01:00
passwords.php	passwords.php: fix some spelling issues in french translation	2017-07-22 23:45:09 +02:00
settings.php	Resolved conflicts	2017-08-24 12:21:43 +05:30
validation.php	french translation	2017-01-16 14:51:33 +01:00