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
phpmyadmin_ynh/conf/upstream_version

6 lines
83 B
Text
Raw Normal View History

Merge branch 'master' of https://github.com/YunoHost-Apps/phpmyadmin_ynh into YunoHost-Apps-master Conflicts: conf/upstream_version
2016-06-29 15:42:26 +02:00
<<<<<<< HEAD
version 4.4.11 available
2015-07-07 23:03:49 +02:00
4.4.11
Merge branch 'master' of https://github.com/YunoHost-Apps/phpmyadmin_ynh into YunoHost-Apps-master Conflicts: conf/upstream_version
2016-06-29 15:42:26 +02:00
=======
Update the latst sources Update to version 4.6.3
2016-06-28 15:05:34 +02:00
4.6.3
Merge branch 'master' of https://github.com/YunoHost-Apps/phpmyadmin_ynh into YunoHost-Apps-master Conflicts: conf/upstream_version
2016-06-29 15:42:26 +02:00
>>>>>>> cdf71f3fb6106bec9648b110eddceb6859a50902
Reference in a new issue Copy permalink