YunoHost-Apps/phpmyadmin_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/phpmyadmin_ynh.git synced 2024-09-03 19:56:46 +02:00
Code Issues Activity Actions

Cleaning of sync with updated branch

Browse source
This commit is contained in:
polytan02 2016-06-29 14:46:55 +01:00
parent a52962dd86
commit ae4b6cc55b
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
conf/upstream_version
View file

@ -1,5 +1 @@
<<<<<<< HEAD
4.4.11
=======
4.6.3 4.6.3
>>>>>>> cdf71f3fb6106bec9648b110eddceb6859a50902