diff --git a/README.md b/README.md index 2b872c9c3f0624fff47c2baee895ecaec5b8d57f..03854700787eaa459e51f3857d0d88d2102f3de7 100755 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# php{ip}am +# {php}IPAM Website: https://phpipam.net/ ## Description @@ -13,6 +13,12 @@ to be able to display javascript quickly and correctly. - [Update](https://phpipam.net/documents/upgrade/) - [Demo page](http://demo.phpipam.net) (Login: `Admin / ipamadmin`) +## Branches + - MASTER: Current development release + - 1.3: Productional branch for 1.3.x release + - 1.2: Productional branch for 1.2.x release (obsolete) + - Other branches: Feature testing + ## I forgot my Admin password!? Just run `php functions/scripts/reset-admin-password.php` in the cli and enter your new password